summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/button.cpp12
-rw-r--r--src/ui/button.h3
-rw-r--r--src/ui/check.cpp15
-rw-r--r--src/ui/check.h2
-rw-r--r--src/ui/color.cpp12
-rw-r--r--src/ui/color.h2
-rw-r--r--src/ui/compass.cpp2
-rw-r--r--src/ui/compass.h2
-rw-r--r--src/ui/control.h1
-rw-r--r--src/ui/displayinfo.cpp3
-rw-r--r--src/ui/displaytext.cpp5
-rw-r--r--src/ui/displaytext.h6
-rw-r--r--src/ui/edit.cpp8
-rw-r--r--src/ui/edit.h1
-rw-r--r--src/ui/editvalue.cpp1
-rw-r--r--src/ui/group.cpp14
-rw-r--r--src/ui/image.cpp6
-rw-r--r--src/ui/interface.h1
-rw-r--r--src/ui/key.cpp5
-rw-r--r--src/ui/list.cpp1
-rw-r--r--src/ui/maindialog.cpp2
-rw-r--r--src/ui/maindialog.h1
-rw-r--r--src/ui/mainmap.cpp4
-rw-r--r--src/ui/mainmap.h18
-rw-r--r--src/ui/map.cpp38
-rw-r--r--src/ui/scroll.cpp12
-rw-r--r--src/ui/shortcut.cpp14
-rw-r--r--src/ui/shortcut.h4
-rw-r--r--src/ui/slider.cpp14
-rw-r--r--src/ui/slider.h2
-rw-r--r--src/ui/studio.cpp16
-rw-r--r--src/ui/studio.h4
-rw-r--r--src/ui/window.h1
33 files changed, 109 insertions, 123 deletions
diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index b8934c4..d6a5c40 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -17,13 +17,15 @@
-#include "button.h"
+#include "ui/button.h"
-#include <common/event.h>
-#include <common/misc.h>
-#include <common/restext.h>
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/restext.h"
-#include <graphics/engine/engine.h>
+#include "graphics/engine/engine.h"
+
+#include <string.h>
namespace Ui {
diff --git a/src/ui/button.h b/src/ui/button.h
index ffaf220..33a48ee 100644
--- a/src/ui/button.h
+++ b/src/ui/button.h
@@ -19,7 +19,8 @@
#pragma once
-#include "control.h"
+#include "ui/control.h"
+
namespace Ui {
diff --git a/src/ui/check.cpp b/src/ui/check.cpp
index 5c076d4..43db0d1 100644
--- a/src/ui/check.cpp
+++ b/src/ui/check.cpp
@@ -16,16 +16,17 @@
// * along with this program. If not, see http://www.gnu.org/licenses/.
-#include "check.h"
+#include "ui/check.h"
-#include <common/event.h>
-#include <common/iman.h>
-#include <common/misc.h>
-#include <common/restext.h>
+#include "common/event.h"
+#include "common/iman.h"
+#include "common/misc.h"
+#include "common/restext.h"
-#include <graphics/engine/engine.h>
-#include <graphics/engine/text.h>
+#include "graphics/engine/engine.h"
+#include "graphics/engine/text.h"
+#include <string.h>
namespace Ui {
diff --git a/src/ui/check.h b/src/ui/check.h
index 1ad8a3a..af26add 100644
--- a/src/ui/check.h
+++ b/src/ui/check.h
@@ -19,7 +19,7 @@
#pragma once
-#include "control.h"
+#include "ui/control.h"
namespace Gfx{
diff --git a/src/ui/color.cpp b/src/ui/color.cpp
index c8588b8..2666f84 100644
--- a/src/ui/color.cpp
+++ b/src/ui/color.cpp
@@ -16,7 +16,7 @@
// * along with this program. If not, see http://www.gnu.org/licenses/.
-#include "color.h"
+#include "ui/color.h"
#include "common/event.h"
#include "common/iman.h"
@@ -26,6 +26,8 @@
#include "graphics/core/device.h"
#include "graphics/engine/engine.h"
+#include <string.h>
+
namespace Ui {
const float DELAY1 = 0.4f;
@@ -188,10 +190,10 @@ void CColor::Draw()
m_engine->SetTexture("xxx.tga"); // no texture
m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
- vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
- vertex[1] = Gfx::VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
- vertex[2] = Gfx::VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
- vertex[3] = Gfx::VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color,0x00000000, Math::Point(0.0f, 0.0f));
+ vertex[0] = Gfx::VertexCol(Math::Vector(p1.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[1] = Gfx::VertexCol(Math::Vector(p1.x, p2.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[2] = Gfx::VertexCol(Math::Vector(p2.x, p1.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
+ vertex[3] = Gfx::VertexCol(Math::Vector(p2.x, p2.y, 0.0f), color, Gfx::Color(), Math::Point(0.0f, 0.0f));
device = m_engine->GetDevice();
device->DrawPrimitive(Gfx::PRIMITIVE_TRIANGLE_STRIP, vertex, 4);
diff --git a/src/ui/color.h b/src/ui/color.h
index c282429..ad99ddd 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -19,8 +19,8 @@
#pragma once
+#include "ui/control.h"
-#include "control.h"
namespace Gfx{
class CEngine;
diff --git a/src/ui/compass.cpp b/src/ui/compass.cpp
index 1969710..102b697 100644
--- a/src/ui/compass.cpp
+++ b/src/ui/compass.cpp
@@ -15,7 +15,7 @@
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-#include "compass.h"
+#include "ui/compass.h"
#include "common/event.h"
#include "common/iman.h"
diff --git a/src/ui/compass.h b/src/ui/compass.h
index e8ccc17..09eec9d 100644
--- a/src/ui/compass.h
+++ b/src/ui/compass.h
@@ -19,8 +19,8 @@
#pragma once
+#include "ui/control.h"
-#include "control.h"
namespace Gfx {
class CEngine;
diff --git a/src/ui/control.h b/src/ui/control.h
index 48c3ef9..e100002 100644
--- a/src/ui/control.h
+++ b/src/ui/control.h
@@ -23,7 +23,6 @@
#include <common/event.h>
#include <common/iman.h>
-#include <common/language.h>
#include <common/misc.h>
#include <common/restext.h>
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp
index 2cba9e3..43909b2 100644
--- a/src/ui/displayinfo.cpp
+++ b/src/ui/displayinfo.cpp
@@ -28,7 +28,6 @@
#include "window.h"
#include "common/iman.h"
-#include "common/language.h"
#include "common/misc.h"
#include "common/restext.h"
@@ -44,7 +43,7 @@
#include "script/cbottoken.h"
-
+#include <string.h>
namespace Ui {
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp
index aa51653..63075ee 100644
--- a/src/ui/displaytext.cpp
+++ b/src/ui/displaytext.cpp
@@ -28,7 +28,6 @@
#include "common/event.h"
#include "common/iman.h"
-#include "common/misc.h"
#include "common/restext.h"
#include "graphics/engine/engine.h"
@@ -180,7 +179,7 @@ void CDisplayText::DisplayError(Error err, Math::Vector goal, float height,
// Displays text.
-void CDisplayText::DisplayText(char *text, CObject* pObj,
+void CDisplayText::DisplayText(const char *text, CObject* pObj,
float time, TextType type)
{
Math::Vector pos;
@@ -196,7 +195,7 @@ void CDisplayText::DisplayText(char *text, CObject* pObj,
// Displays text.
-void CDisplayText::DisplayText(char *text, Math::Vector goal, float height,
+void CDisplayText::DisplayText(const char *text, Math::Vector goal, float height,
float dist, float time, TextType type)
{
CObject* toto;
diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h
index b8af97e..5714cc5 100644
--- a/src/ui/displaytext.h
+++ b/src/ui/displaytext.h
@@ -21,7 +21,7 @@
#include "common/event.h"
-#include "common/misc.h"
+#include "common/global.h"
#include "sound/sound.h"
@@ -64,8 +64,8 @@ public:
void DisplayError(Error err, CObject* pObj, float time=10.0f);
void DisplayError(Error err, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f);
- void DisplayText(char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO);
- void DisplayText(char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
+ void DisplayText(const char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO);
+ void DisplayText(const char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
void HideText(bool bHide);
void ClearText();
bool ClearLastText();
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index cc911a4..d298ad3 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -20,6 +20,8 @@
#include "edit.h"
+#include <string.h>
+
namespace Ui {
const float MARGX = (5.0f/640.0f);
@@ -1778,7 +1780,8 @@ bool CEdit::ReadText(const char *filename, int addSize)
{
if ( SearchKey(buffer+i+5, key) )
{
- res = m_app->GetKey(key, 0); // TODO
+ res = 0;
+ //res = m_app->GetInputBinding(key).key; // TODO input bindings
if ( res != 0 )
{
if ( GetResource(RES_KEY, res, iName) )
@@ -1797,7 +1800,8 @@ bool CEdit::ReadText(const char *filename, int addSize)
m_format[j] = font;
j ++;
- res = m_app->GetKey(key, 1); // TODO
+ // res = m_app->GetInputBinding(key).joy; // TODO input bindings
+ res = 0;
if ( res != 0 )
{
if ( GetResource(RES_KEY, res, iName) )
diff --git a/src/ui/edit.h b/src/ui/edit.h
index 22ac577..2de3028 100644
--- a/src/ui/edit.h
+++ b/src/ui/edit.h
@@ -30,7 +30,6 @@
#include <graphics/engine/engine.h>
#include <graphics/engine/text.h>
-#include <common/language.h>
#include <common/event.h>
#include <common/misc.h>
#include <common/iman.h>
diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp
index f747c94..e5780fd 100644
--- a/src/ui/editvalue.cpp
+++ b/src/ui/editvalue.cpp
@@ -22,7 +22,6 @@
//#include <stdio.h>
//#include <d3d.h>
-//#include "common/struct.h"
//#include "old/d3dengine.h"
//#include "old/math3d.h"
#include "common/event.h"
diff --git a/src/ui/group.cpp b/src/ui/group.cpp
index da0aa37..facf208 100644
--- a/src/ui/group.cpp
+++ b/src/ui/group.cpp
@@ -16,22 +16,18 @@
// group.cpp
+#include "ui/group.h"
-//#include <windows.h>
-#include <stdio.h>
-//#include <d3d.h>
-
-//#include "common/struct.h"
-//#include "old/d3dengine.h"
-#include "graphics/engine/engine.h"
-//#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
-#include "ui/group.h"
+#include "graphics/engine/engine.h"
+#include <stdio.h>
+#include <string.h>
+
namespace Ui {
// Object's constructor.
diff --git a/src/ui/image.cpp b/src/ui/image.cpp
index 5bf6e45..473492f 100644
--- a/src/ui/image.cpp
+++ b/src/ui/image.cpp
@@ -18,20 +18,16 @@
// image.cpp
-//#include <windows.h>
#include <stdio.h>
-//#include <d3d.h>
-//#include "common/struct.h"
-//#include "old/d3dengine.h"
#include "graphics/engine/engine.h"
-//#include "old/math3d.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
#include "common/restext.h"
#include "ui/image.h"
+#include <string.h>
namespace Ui {
diff --git a/src/ui/interface.h b/src/ui/interface.h
index 7123c05..aa0bd98 100644
--- a/src/ui/interface.h
+++ b/src/ui/interface.h
@@ -22,7 +22,6 @@
#include <string>
#include <common/event.h>
-#include <common/struct.h>
#include <common/misc.h>
#include <common/iman.h>
diff --git a/src/ui/key.cpp b/src/ui/key.cpp
index 89473a8..77c17b0 100644
--- a/src/ui/key.cpp
+++ b/src/ui/key.cpp
@@ -20,6 +20,8 @@
#include <ui/key.h>
+#include <string.h>
+
namespace Ui {
void GetKeyName(char *name, int key)
@@ -116,6 +118,7 @@ bool CKey::TestKey(int key)
{
if ( key == KEY(PAUSE) || key == KEY(PRINT) ) return true; // blocked key
+ /* TODO: input bindings
for (int i = 0; i < 20; i++) {
for (int j = 0; j < 2; j++) {
if (key == m_app->GetKey(i, j) ) // key used?
@@ -126,7 +129,7 @@ bool CKey::TestKey(int key)
m_app->SetKey(i, 0, m_app->GetKey(i, 1)); // shift
m_app->SetKey(i, 1, 0);
}
- }
+ }*/
return false; // not used
}
diff --git a/src/ui/list.cpp b/src/ui/list.cpp
index 73a48e3..cbf8268 100644
--- a/src/ui/list.cpp
+++ b/src/ui/list.cpp
@@ -20,6 +20,7 @@
#include <ui/list.h>
+#include <string.h>
namespace Ui {
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 6b071c1..84a4871 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -17,9 +17,7 @@
// maindialog.cpp
-#include "common/struct.h"
#include "common/global.h"
-#include "common/language.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/profile.h"
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h
index bddd61f..5b33f92 100644
--- a/src/ui/maindialog.h
+++ b/src/ui/maindialog.h
@@ -19,7 +19,6 @@
#pragma once
-#include "common/struct.h"
#include "object/robotmain.h"
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp
index e874fba..601c035 100644
--- a/src/ui/mainmap.cpp
+++ b/src/ui/mainmap.cpp
@@ -36,8 +36,8 @@ CMainMap::CMainMap()
m_iMan->AddInstance(CLASS_MAP, this);
m_interface = (CInterface*)m_iMan->SearchInstance(CLASS_INTERFACE);
- m_event = (CEvent*)m_iMan->SearchInstance(CLASS_EVENT);
- m_engine = (CD3DEngine*)m_iMan->SearchInstance(CLASS_ENGINE);
+ m_event = (CEventQueue*)m_iMan->SearchInstance(CLASS_EVENT);
+ m_engine = (Gfx::CEngine*)m_iMan->SearchInstance(CLASS_ENGINE);
m_mapMode = 1;
m_bFixImage = false;
diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h
index 91e93c9..35aae4c 100644
--- a/src/ui/mainmap.h
+++ b/src/ui/mainmap.h
@@ -19,16 +19,12 @@
#pragma once
-#include <graphics/core/color.h>
+#include "common/event.h"
+#include "graphics/core/color.h"
+#include "math/point.h"
+#include "object/object.h"
+#include "ui/interface.h"
-#include <common/struct.h>
-#include <common/event.h>
-
-#include <math/point.h>
-
-#include <object/object.h>
-
-#include <ui/interface.h>
namespace Ui {
@@ -60,8 +56,8 @@ class CMainMap
protected:
CInstanceManager* m_iMan;
- CEvent* m_event;
- CD3DEngine* m_engine;
+ CEventQueue* m_event;
+ Gfx::CEngine* m_engine;
CInterface* m_interface;
int m_mapMode;
diff --git a/src/ui/map.cpp b/src/ui/map.cpp
index 5139d88..5440854 100644
--- a/src/ui/map.cpp
+++ b/src/ui/map.cpp
@@ -20,7 +20,7 @@
#include "map.h"
-
+#include <string.h>
namespace Ui {
@@ -48,7 +48,7 @@ CMap::CMap() : CControl()
m_waterColor.g = 0.80f;
m_waterColor.b = 1.00f; // blue
- m_half = m_terrain->GetMosaic() * m_terrain->GetBrick() * m_terrain->GetSize() / 2.0f;
+ m_half = m_terrain->GetMosaicCount() * m_terrain->GetBrickCount() * m_terrain->GetBrickSize() / 2.0f;
m_highlightRank = -1;
FlushObject();
@@ -84,7 +84,7 @@ void CMap::SetOffset(float ox, float oy)
{
m_offset.x = ox;
m_offset.y = oy;
- m_half = m_terrain->GetMosaic() * m_terrain->GetBrick() * m_terrain->GetSize() / 2.0f;
+ m_half = m_terrain->GetMosaicCount() * m_terrain->GetBrickCount() * m_terrain->GetBrickSize() / 2.0f;
}
// Choice of the global angle of rotation.
@@ -119,7 +119,7 @@ void CMap::SetDebug(bool bDebug)
void CMap::SetZoom(float value)
{
m_zoom = value;
- m_half = m_terrain->GetMosaic() * m_terrain->GetBrick() * m_terrain->GetSize() / 2.0f;
+ m_half = m_terrain->GetMosaicCount() * m_terrain->GetBrickCount() * m_terrain->GetBrickSize() / 2.0f;
}
float CMap::GetZoom()
@@ -999,9 +999,13 @@ void CMap::UpdateTerrain()
int x, y;
if ( m_fixImage[0] != 0 ) return; // still image?
- if ( !m_engine->OpenImage("map.tga") ) return;
- scale = m_terrain->GetScaleRelief();
+ // TODO: map texture manipulation
+ return;
+
+ // if ( !m_engine->OpenImage("map.tga") ) return;
+
+ scale = m_terrain->GetReliefScale();
water = m_water->GetLevel();
color.a = 0.0f;
@@ -1040,12 +1044,12 @@ void CMap::UpdateTerrain()
color.b = m_waterColor.b + (intensity-0.5f);
}
- m_engine->SetDot(x, y, color);
+ //m_engine->SetDot(x, y, color);
}
}
- m_engine->CopyImage(); // copy the ground drawing
- m_engine->CloseImage();
+ //m_engine->CopyImage(); // copy the ground drawing
+ //m_engine->CloseImage();
}
// Updates the field in the map.
@@ -1058,10 +1062,14 @@ void CMap::UpdateTerrain(int bx, int by, int ex, int ey)
int x, y;
if ( m_fixImage[0] != 0 ) return; // still image?
- if ( !m_engine->OpenImage("map.tga") ) return;
- m_engine->LoadImage();
- scale = m_terrain->GetScaleRelief();
+ // TODO: map texture manipulation
+ return;
+
+ //if ( !m_engine->OpenImage("map.tga") ) return;
+ //m_engine->LoadImage();
+
+ scale = m_terrain->GetReliefScale();
water = m_water->GetLevel();
color.a = 0.0f;
@@ -1100,12 +1108,12 @@ void CMap::UpdateTerrain(int bx, int by, int ex, int ey)
color.b = m_waterColor.b + (intensity-0.5f);
}
- m_engine->SetDot(x, y, color);
+ //m_engine->SetDot(x, y, color);
}
}
- m_engine->CopyImage(); // copy the ground drawing
- m_engine->CloseImage();
+ //m_engine->CopyImage(); // copy the ground drawing
+ //m_engine->CloseImage();
}
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp
index b54c868..86595f9 100644
--- a/src/ui/scroll.cpp
+++ b/src/ui/scroll.cpp
@@ -17,20 +17,14 @@
// scroll.cpp
+#include "ui/scroll.h"
-//#include <windows.h>
-//#include <stdio.h>
-//#include <d3d.h>
-
-//#include "common/struct.h"
-//#include "old/d3dengine.h"
-//#include "old/math3d.h"
-#include "graphics/engine/engine.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
+#include "graphics/engine/engine.h"
#include "ui/button.h"
-#include "ui/scroll.h"
+
namespace Ui {
diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp
index 05e5d2d..7001e97 100644
--- a/src/ui/shortcut.cpp
+++ b/src/ui/shortcut.cpp
@@ -17,21 +17,15 @@
// shortcut.cpp
+#include "ui/shortcut.h"
-//#include <windows.h>
-//#include <stdio.h>
-//#include <d3d.h>
-#include <math.h>
-//#include "common/struct.h"
-//#include "old/d3dengine.h"
-//#include "old/math3d.h"
-#include "graphics/engine/engine.h"
-#include "graphics/core/device.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-#include "ui/shortcut.h"
+#include "graphics/engine/engine.h"
+#include "graphics/core/device.h"
+#include <math.h>
namespace Ui {
diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h
index 9ee97e0..7e7899e 100644
--- a/src/ui/shortcut.h
+++ b/src/ui/shortcut.h
@@ -19,9 +19,9 @@
#pragma once
-#include <ui/control.h>
+#include "ui/control.h"
-#include <common/event.h>
+#include "common/event.h"
namespace Ui {
diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp
index 27bcfbb..2bf0cc8 100644
--- a/src/ui/slider.cpp
+++ b/src/ui/slider.cpp
@@ -17,22 +17,16 @@
// slider.cpp
+#include "ui/slider.h"
-//#include <windows.h>
-#include <stdio.h>
-//#include <d3d.h>
-
-//#include "common/struct.h"
-//#include "old/d3dengine.h"
-//#include "old/math3d.h"
-#include "graphics/engine/engine.h"
#include "common/event.h"
#include "common/misc.h"
#include "common/iman.h"
-//#include "old/text.h"
+#include "graphics/engine/engine.h"
#include "graphics/engine/text.h"
#include "ui/button.h"
-#include "ui/slider.h"
+
+#include <stdio.h>
namespace Ui {
diff --git a/src/ui/slider.h b/src/ui/slider.h
index 0de9b3c..b0de011 100644
--- a/src/ui/slider.h
+++ b/src/ui/slider.h
@@ -26,6 +26,8 @@
namespace Ui {
+class CButton;
+
class CSlider : public CControl
{
public:
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp
index 5062798..2b90b8f 100644
--- a/src/ui/studio.cpp
+++ b/src/ui/studio.cpp
@@ -22,6 +22,10 @@
#include <script/cbottoken.h>
+
+const int MAX_FNAME = 255;
+
+
namespace Ui {
@@ -36,7 +40,7 @@ CStudio::CStudio()
m_event = static_cast<CEventQueue*>(m_iMan->SearchInstance(CLASS_EVENT));
m_interface = static_cast<CInterface*>(m_iMan->SearchInstance(CLASS_INTERFACE));
m_main = static_cast<CRobotMain*>(m_iMan->SearchInstance(CLASS_MAIN));
- m_camera = static_cast<CCamera*>(m_iMan->SearchInstance(CLASS_CAMERA));
+ m_camera = static_cast<Gfx::CCamera*>(m_iMan->SearchInstance(CLASS_CAMERA));
m_sound = static_cast<CSoundInterface*>(m_iMan->SearchInstance(CLASS_SOUND));
m_app = CApplication::GetInstancePointer();
@@ -537,7 +541,7 @@ void CStudio::StartEditScript(CScript *script, std::string name, int rank)
m_bInitPause = m_engine->GetPause();
m_main->SetSpeed(1.0f);
m_editCamera = m_camera->GetType();
- m_camera->SetType(CAM_TYPE_EDIT);
+ m_camera->SetType(Gfx::CAM_TYPE_EDIT);
m_bRunning = m_script->IsRunning();
m_bRealTime = m_bRunning;
@@ -1447,8 +1451,8 @@ void CStudio::UpdateDialogPublic()
CCheck* pc;
CLabel* pl;
char name[100];
- char dir[_MAX_FNAME];
- char text[_MAX_FNAME+100];
+ char dir[MAX_FNAME];
+ char text[MAX_FNAME+100];
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
if ( pw == nullptr ) return;
@@ -1486,8 +1490,8 @@ void CStudio::UpdateDialogList()
struct _finddata_t fileBuffer;
struct _finddata_t* listBuffer;
bool bDo;
- char dir[_MAX_FNAME];
- char temp[_MAX_FNAME];
+ char dir[MAX_FNAME];
+ char temp[MAX_FNAME];
int nbFilenames, i;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
diff --git a/src/ui/studio.h b/src/ui/studio.h
index e9fb69c..8b7355c 100644
--- a/src/ui/studio.h
+++ b/src/ui/studio.h
@@ -29,7 +29,6 @@
#include <graphics/engine/camera.h>
#include <common/event.h>
-#include <common/struct.h>
#include <common/misc.h>
#include <common/iman.h>
@@ -110,7 +109,7 @@ class CStudio
Gfx::CEngine* m_engine;
CEventQueue* m_event;
CRobotMain* m_main;
- CCamera* m_camera;
+ Gfx::CCamera* m_camera;
CSoundInterface* m_sound;
CInterface* m_interface;
CApplication *m_app;
@@ -122,7 +121,6 @@ class CStudio
bool m_bEditMaximized;
bool m_bEditMinimized;
- CameraType m_editCamera;
Math::Point m_editActualPos;
Math::Point m_editActualDim;
Math::Point m_editFinalPos;
diff --git a/src/ui/window.h b/src/ui/window.h
index 9262a1a..5fa6331 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -21,7 +21,6 @@
#include <string>
-#include <common/language.h>
#include <common/event.h>
#include <common/misc.h>
#include <common/restext.h>
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-01 21:01:59 +0000