diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
commit | 7479f486b671acb2a6aea2c84a56b383aaba00ca (patch) | |
tree | 4043545a14234dfaa2d7d08d59c7ee9ee97f0de9 /src/object/mainmovie.h | |
parent | 901f10b2bac18a2063cd21798f22b3917e8519b5 (diff) | |
parent | 57d33d79ea570773d84ad81d4a61f50e079979ef (diff) | |
download | colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.gz colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.bz2 colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.zip |
Forgotten fix in dev-graphics
Diffstat (limited to 'src/object/mainmovie.h')
-rw-r--r-- | src/object/mainmovie.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h index 23721fb..27e4df3 100644 --- a/src/object/mainmovie.h +++ b/src/object/mainmovie.h @@ -24,15 +24,14 @@ class CInstanceManager; -class CEvent; -class CD3DEngine; -class CInterface; class CRobotMain; -class CCamera; -class CSound; - - +class CSoundInterface; +namespace Gfx +{ + class CCamera; + class CEngine; +}; enum MainMovieType { @@ -54,24 +53,22 @@ public: bool Stop(); bool IsExist(); bool EventProcess(const Event &event); - MainMovieType RetType(); - MainMovieType RetStopType(); + MainMovieType GetType(); + MainMovieType GetStopType(); protected: protected: - CInstanceManager* m_iMan; - CEvent* m_event; - CD3DEngine* m_engine; - CInterface* m_interface; - CRobotMain* m_main; - CCamera* m_camera; - CSound* m_sound; - - MainMovieType m_type; - MainMovieType m_stopType; - float m_speed; - float m_progress; + CInstanceManager* m_iMan; + Gfx::CEngine* m_engine; + CRobotMain* m_main; + Gfx::CCamera* m_camera; + CSoundInterface* m_sound; + + MainMovieType m_type; + MainMovieType m_stopType; + float m_speed; + float m_progress; Math::Vector m_initialEye; Math::Vector m_initialLookat; Math::Vector m_finalEye[2]; |