Changeset 8851 for code/branches/ai2/src

Timestamp:

Aug 21, 2011, 6:52:33 PM (13 years ago)

Author:

jo

Message:

Added docking part & powerful spaceship to the level. Some DockingController bugs have to be erased though.

File:

• code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)

code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

@@ -957 +957 @@
     bool ArtificialController::sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
     {
+        if(!entity1 || !entity2)
+            return true;
         if (entity1 == entity2)
             return true;