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/mainmap.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/mainmap.h')
-rw-r--r-- | src/ui/mainmap.h | 18 |
1 files changed, 7 insertions, 11 deletions
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; |