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/object/robotmain.cpp | |
| 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/object/robotmain.cpp')
| -rw-r--r-- | src/object/robotmain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index b6aedaa..fb683ae 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -866,7 +866,7 @@ void CRobotMain::ChangePhase(Phase phase) { SaveAllScript(); m_sound->StopMusic(); - m_camera->SetObject(0); + m_camera->SetControllingObject(0); /* TODO: #if _SCHOOL if ( true ) @@ -2226,7 +2226,7 @@ CObject* CRobotMain::DeselectAll() void CRobotMain::SelectOneObject(CObject* obj, bool displayError) { obj->SetSelect(true, displayError); - m_camera->SetObject(obj); + m_camera->SetControllingObject(obj); ObjectType type = obj->GetType(); if ( type == OBJECT_HUMAN || @@ -2737,8 +2737,8 @@ void CRobotMain::HiliteObject(Math::Point pos) obj = DetectObject(pos); - if (m_camera->GetType() == Gfx::CAM_TYPE_ONBOARD && - m_camera->GetObject() == obj) + if ((m_camera->GetType() == Gfx::CAM_TYPE_ONBOARD) && + (m_camera->GetControllingObject() == obj)) return; } } @@ -4309,7 +4309,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) if (obj != nullptr) { SelectObject(obj); - m_camera->SetObject(obj); + m_camera->SetControllingObject(obj); m_camera->SetType(obj->GetCameraType()); } } @@ -4324,7 +4324,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) m_camera->FixCamera(); SelectObject(sel); - m_camera->SetObject(sel); + m_camera->SetControllingObject(sel); m_beginSatCom = true; // message already displayed } |