immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Robby (OBJECT_TOTO) animations

master
krzys-h 2015-07-14 21:39:51 +02:00
parent d5da68d59a
commit 730319ba20
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/object/object_manager.cpp
View File

@ -265,7 +265,6 @@ CObject* CObjectManager::Radar(CObject* pThis, Math::Vector thisPosition, float
if ( pObj->GetProxyActivate() ) continue; if ( pObj->GetProxyActivate() ) continue;
oType = pObj->GetType(); oType = pObj->GetType();
if ( oType == OBJECT_TOTO || oType == OBJECT_CONTROLLER ) continue;
if (cbotTypes) if (cbotTypes)
{ {
@ -295,6 +294,10 @@ CObject* CObjectManager::Radar(CObject* pThis, Math::Vector thisPosition, float
// END OF TODO // END OF TODO
} }
if ( std::find(type.begin(), type.end(), oType) == type.end() && type.size() > 0 ) continue;
if ( (oType == OBJECT_TOTO || oType == OBJECT_CONTROLLER) && type.size() == 0 ) continue; // allow OBJECT_TOTO and OBJECT_CONTROLLER only if explicitly asked in type parameter
if ( filter_flying == FILTER_ONLYLANDING ) if ( filter_flying == FILTER_ONLYLANDING )
{ {
physics = pObj->GetPhysics(); physics = pObj->GetPhysics();
@ -318,8 +321,6 @@ CObject* CObjectManager::Radar(CObject* pThis, Math::Vector thisPosition, float
if ( filter_enemy != 0 && (filter_enemy & enemy) == 0 ) continue; if ( filter_enemy != 0 && (filter_enemy & enemy) == 0 ) continue;
} }
if ( std::find(type.begin(), type.end(), oType) == type.end() && type.size() > 0 ) continue;
oPos = pObj->GetPosition(); oPos = pObj->GetPosition();
d = Math::DistanceProjected(iPos, oPos); d = Math::DistanceProjected(iPos, oPos);
if ( d < minDist || d > maxDist ) continue; // too close or too far? if ( d < minDist || d > maxDist ) continue; // too close or too far?