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/graphics/engine/camera.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/graphics/engine/camera.h')
| -rw-r--r-- | src/graphics/engine/camera.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphics/engine/camera.h b/src/graphics/engine/camera.h index 20d252d..0ffc2c2 100644 --- a/src/graphics/engine/camera.h +++ b/src/graphics/engine/camera.h @@ -28,8 +28,8 @@ #include "graphics/engine/engine.h" -class CInstanceManager; class CObject; +class CRobotMain; // Graphics module namespace @@ -130,7 +130,7 @@ enum CameraOverEffect class CCamera { public: - CCamera(CInstanceManager* iMan); + CCamera(); ~CCamera(); //! Management of an event @@ -258,8 +258,8 @@ protected: void OverFrame(const Event &event); protected: - CInstanceManager* m_iMan; CEngine* m_engine; + CRobotMain* m_main; CTerrain* m_terrain; CWater* m_water; |