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/auto | |
| 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/auto')
| -rw-r--r-- | src/object/auto/autobase.cpp | 6 | ||||
| -rw-r--r-- | src/object/auto/autoportico.cpp | 4 |
2 files changed, 5 insertions, 5 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 ) |