Changeset 1758 for code/trunk/src/orxonox

Timestamp:

Sep 10, 2008, 11:09:43 AM (16 years ago)

Author:

scheusso

Message:

cant remember

File:

• code/trunk/src/orxonox/objects/SpaceShip.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -76 +76 @@
       ObjectList<SpaceShip>::iterator it;
       for(it = ObjectList<SpaceShip>::begin(); it; ++it){
-        if( (it)->myShip_ )
+        assert(it->isA(Class(SpaceShip)));
+        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) )
           return *it;
       }
-      assert(0);
+      return 0;
       return 0;
     }