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/graphics/engine/camera.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/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 1a82f9f..7a7350f 100644 --- a/src/graphics/engine/camera.h +++ b/src/graphics/engine/camera.h @@ -136,8 +136,8 @@ class CCamera { void Init(Math::Vector eye, Math::Vector lookat, float delay); //! Sets the object controlling the camera - void SetObject(CObject* object); - CObject* GetObject(); + void SetControllingObject(CObject* object); + CObject* GetControllingObject(); //! Change the type of camera void SetType(Gfx::CameraType type); @@ -208,7 +208,7 @@ protected: //! Changes the camera according to the mouse moved bool EventMouseMove(const Event &event); //! Mouse wheel operation - void EventMouseWheel(int dir); + void EventMouseWheel(WheelDirection dir); //! Changes the camera according to the time elapsed bool EventFrame(const Event &event); //! Moves the point of view |