summaryrefslogtreecommitdiffstats
path: root/src/object/object.cpp
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-17 20:47:27 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-17 20:47:27 +0200
commit844e11db4f394004258cdca8f8fd8bc95c41a985 (patch)
tree5d593dd3105a3fe0a07894933f2d7af688397c2a /src/object/object.cpp
parent050f9d25428d8298b010c73e9721d7b7203ef31f (diff)
downloadcolobot-844e11db4f394004258cdca8f8fd8bc95c41a985.tar.gz
colobot-844e11db4f394004258cdca8f8fd8bc95c41a985.tar.bz2
colobot-844e11db4f394004258cdca8f8fd8bc95c41a985.zip
changes needeto to cimpile on windows.
Diffstat (limited to 'src/object/object.cpp')
-rw-r--r--src/object/object.cpp10
1 files changed, 5 insertions, 5 deletions
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);
}
}