diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-01-11 23:42:45 +0100 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-01-11 23:43:10 +0100 |
| commit | 652dc6081df8dc73bc9f57c031420e498be71451 (patch) | |
| tree | 9dc9482232eedfc0040c6ada6c202b19af34a9d7 /src/physics | |
| parent | d8555866747d8624debf52620605d90890e98c15 (diff) | |
| download | colobot-652dc6081df8dc73bc9f57c031420e498be71451.tar.gz colobot-652dc6081df8dc73bc9f57c031420e498be71451.tar.bz2 colobot-652dc6081df8dc73bc9f57c031420e498be71451.zip | |
Removed some unused objects
Diffstat (limited to 'src/physics')
| -rw-r--r-- | src/physics/physics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 85dd3a2..a7e1e6c 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -2565,19 +2565,19 @@ int CPhysics::ObjectAdapt(const Math::Vector &pos, const Math::Vector &angle) oType == OBJECT_KEYd || oType == OBJECT_TNT || (oType >= OBJECT_PLANT0 && oType <= OBJECT_PLANT19 ) || - (oType >= OBJECT_MUSHROOM0 && oType <= OBJECT_MUSHROOM9) ) continue; + (oType >= OBJECT_MUSHROOM1 && oType <= OBJECT_MUSHROOM2) ) continue; } -#if _TEEN +/* TODO: #if _TEEN if ( oType == OBJECT_WAYPOINT && pObj->GetEnable() && !m_object->GetResetBusy() ) // driving vehicle? -#else +#else */ if ( oType == OBJECT_WAYPOINT && pObj->GetEnable() && !m_object->GetResetBusy() && m_object->GetTrainer() ) // driving vehicle? -#endif +/* #endif */ { oPos = pObj->GetPosition(0); distance = Math::DistanceProjected(oPos, iPos); |