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/object/mainmovie.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/object/mainmovie.h')
| -rw-r--r-- | src/object/mainmovie.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h index eba21eb..4554431 100644 --- a/src/object/mainmovie.h +++ b/src/object/mainmovie.h @@ -23,18 +23,17 @@ #include "common/event.h" + #include "math/vector.h" -class CInstanceManager; class CRobotMain; class CSoundInterface; -namespace Gfx -{ - class CCamera; - class CEngine; -}; +namespace Gfx { +class CCamera; +class CEngine; +} enum MainMovieType { @@ -48,7 +47,7 @@ enum MainMovieType class CMainMovie { public: - CMainMovie(CInstanceManager* iMan); + CMainMovie(); ~CMainMovie(); void Flush(); @@ -60,9 +59,6 @@ public: MainMovieType GetStopType(); protected: - -protected: - CInstanceManager* m_iMan; Gfx::CEngine* m_engine; CRobotMain* m_main; Gfx::CCamera* m_camera; |