diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-30 15:01:00 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-30 15:23:05 +0100 |
| commit | e218dcfdf2c58f8841e7ebd220527d08e870a6d5 (patch) | |
| tree | a567db04a8a51e2db87f80e259faf222a7d4becd /src/ui/mainmap.h | |
| parent | bfc701e286259d9a7aa2ff8240704eab2ba3a237 (diff) | |
| parent | e607fed265070be8c518d4302d8b76f738421fb3 (diff) | |
| download | colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.tar.gz colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.tar.bz2 colobot-e218dcfdf2c58f8841e7ebd220527d08e870a6d5.zip | |
Merge branch 'dev'
Merging content from dev
Diffstat (limited to 'src/ui/mainmap.h')
| -rw-r--r-- | src/ui/mainmap.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h index 35aae4c..9d0d72f 100644 --- a/src/ui/mainmap.h +++ b/src/ui/mainmap.h @@ -20,9 +20,13 @@ #pragma once #include "common/event.h" + #include "graphics/core/color.h" + #include "math/point.h" + #include "object/object.h" + #include "ui/interface.h" @@ -55,7 +59,6 @@ class CMainMap void CenterMap(); protected: - CInstanceManager* m_iMan; CEventQueue* m_event; Gfx::CEngine* m_engine; CInterface* m_interface; |