summaryrefslogtreecommitdiffstats
path: root/src/object/auto/autosafe.cpp
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-18 00:01:00 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-18 00:01:00 +0200
commita397922e8d53c6f7ff469d38e5139fd003c705b5 (patch)
tree8f6e92a0ac59d655e5fcc48bd198aa1bae25f0db /src/object/auto/autosafe.cpp
parent844e11db4f394004258cdca8f8fd8bc95c41a985 (diff)
downloadcolobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.tar.gz
colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.tar.bz2
colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.zip
warnings fight in progress.
Diffstat (limited to 'src/object/auto/autosafe.cpp')
-rw-r--r--src/object/auto/autosafe.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp
index 82b1c12..ea0c183 100644
--- a/src/object/auto/autosafe.cpp
+++ b/src/object/auto/autosafe.cpp
@@ -414,9 +414,9 @@ int CAutoSafe::CountKeys()
pObj = static_cast< CObject* >(m_iMan->SearchInstance(CLASS_OBJECT, i));
if ( pObj == 0 ) break;
- oType = pObj->GetType();
if ( pObj->GetTruck() != 0 ) continue;
+ oType = pObj->GetType();
if ( oType != OBJECT_KEYa &&
oType != OBJECT_KEYb &&
oType != OBJECT_KEYc &&
@@ -588,7 +588,6 @@ CObject* CAutoSafe::SearchVehicle()
{
CObject* pObj;
Math::Vector cPos, oPos;
- ObjectType oType;
float dist;
int i;
@@ -599,7 +598,6 @@ CObject* CAutoSafe::SearchVehicle()
pObj = static_cast< CObject* >(m_iMan->SearchInstance(CLASS_OBJECT, i));
if ( pObj == 0 ) break;
- oType = pObj->GetType();
if ( pObj == m_object ) continue;
if ( pObj->GetTruck() != 0 ) continue;