diff options
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/auto/autobase.cpp | 6 | ||||
| -rw-r--r-- | src/object/auto/autoportico.cpp | 4 | ||||
| -rw-r--r-- | src/object/object.cpp | 10 | ||||
| -rw-r--r-- | src/object/robotmain.cpp | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index 9948c01..f354f28 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -154,7 +154,7 @@ begin: pObj = m_main->GetSelectObject(); m_main->SelectObject(pObj); - m_camera->SetObject(pObj); + m_camera->SetControllingObject(pObj); if ( pObj == 0 ) { m_camera->SetType(Gfx::CAM_TYPE_BACK); @@ -624,7 +624,7 @@ begin: pObj = m_main->GetSelectObject(); m_main->SelectObject(pObj); - m_camera->SetObject(pObj); + m_camera->SetControllingObject(pObj); if ( pObj == 0 ) { m_camera->SetType(Gfx::CAM_TYPE_BACK); @@ -1156,7 +1156,7 @@ bool CAutoBase::Abort() pObj = m_main->GetSelectObject(); m_main->SelectObject(pObj); - m_camera->SetObject(pObj); + m_camera->SetControllingObject(pObj); if ( pObj == 0 ) { m_camera->SetType(Gfx::CAM_TYPE_BACK); diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 9738aed..9d04982 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -308,7 +308,7 @@ bool CAutoPortico::EventProcess(const Event &event) pObj = m_main->SearchHuman(); m_main->SelectObject(pObj); - m_camera->SetObject(pObj); + m_camera->SetControllingObject(pObj); m_camera->SetType(Gfx::CAM_TYPE_BACK); m_phase = APOP_WAIT; @@ -367,7 +367,7 @@ bool CAutoPortico::Abort() pObj = m_main->SearchHuman(); m_main->SelectObject(pObj); - m_camera->SetObject(pObj); + m_camera->SetControllingObject(pObj); m_camera->SetType(Gfx::CAM_TYPE_BACK); if ( m_soundChannel != -1 ) diff --git a/src/object/object.cpp b/src/object/object.cpp index 889065e..dd46e0e 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -382,9 +382,9 @@ void CObject::DeleteObject(bool bAll) m_botVar->SetUserPtr(OBJECTDELETED); } - if ( m_camera->GetObject() == this ) + if ( m_camera->GetControllingObject() == this ) { - m_camera->SetObject(0); + m_camera->SetControllingObject(0); } for ( i=0 ; i<1000000 ; i++ ) @@ -403,17 +403,17 @@ void CObject::DeleteObject(bool bAll) type == Gfx::CAM_TYPE_FIX || type == Gfx::CAM_TYPE_EXPLO || type == Gfx::CAM_TYPE_ONBOARD) && - m_camera->GetObject() == this ) + m_camera->GetControllingObject() == this ) { pObj = m_main->SearchNearest(GetPosition(0), this); if ( pObj == 0 ) { - m_camera->SetObject(0); + m_camera->SetControllingObject(0); m_camera->SetType(Gfx::CAM_TYPE_FREE); } else { - m_camera->SetObject(pObj); + m_camera->SetControllingObject(pObj); m_camera->SetType(Gfx::CAM_TYPE_BACK); } } 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 } |