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