diff options
| author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-17 20:47:27 +0200 |
|---|---|---|
| committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-17 20:47:27 +0200 |
| commit | 844e11db4f394004258cdca8f8fd8bc95c41a985 (patch) | |
| tree | 5d593dd3105a3fe0a07894933f2d7af688397c2a /src/graphics/engine | |
| parent | 050f9d25428d8298b010c73e9721d7b7203ef31f (diff) | |
| download | colobot-844e11db4f394004258cdca8f8fd8bc95c41a985.tar.gz colobot-844e11db4f394004258cdca8f8fd8bc95c41a985.tar.bz2 colobot-844e11db4f394004258cdca8f8fd8bc95c41a985.zip | |
changes needeto to cimpile on windows.
Diffstat (limited to 'src/graphics/engine')
| -rw-r--r-- | src/graphics/engine/camera.cpp | 4 | ||||
| -rw-r--r-- | src/graphics/engine/camera.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp index c374ed0..80757c4 100644 --- a/src/graphics/engine/camera.cpp +++ b/src/graphics/engine/camera.cpp @@ -202,12 +202,12 @@ void Gfx::CCamera::Init(Math::Vector eye, Math::Vector lookat, float delay) } -void Gfx::CCamera::SetObject(CObject* object) +void Gfx::CCamera::SetControllingObject(CObject* object) { m_cameraObj = object; } -CObject* Gfx::CCamera::GetObject() +CObject* Gfx::CCamera::GetControllingObject() { return m_cameraObj; } diff --git a/src/graphics/engine/camera.h b/src/graphics/engine/camera.h index 1a82f9f..f2022f7 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); |