diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
| commit | ad6bc13dc2b70741ee3f006e321ba46dd421b9b5 (patch) | |
| tree | 72540c0d47f5501f6080f7b03de600daed0a029a /src/ui/studio.h | |
| parent | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (diff) | |
| parent | 94e7fd920353c39471d8836a8bf87ffb113f1349 (diff) | |
| download | colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.gz colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.bz2 colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.zip | |
Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
Diffstat (limited to 'src/ui/studio.h')
| -rw-r--r-- | src/ui/studio.h | 4 |
1 files changed, 1 insertions, 3 deletions
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; |