Changeset 6891 for code/branches/ai/src/orxonox/controllers/ArtificialController.cc

Timestamp:

May 10, 2010, 4:40:44 PM (14 years ago)

Author:

gasserlu

Message:

DroneController modified, sameTeam() mod. hack

File:

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

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

@@ -501 +501 @@
         }
 
+        DroneController* droneController = 0;
+        droneController = orxonox_cast<DroneController*>(entity1->getController());
+        if (droneController && static_cast<ControllableEntity*>(droneController->getOwner()) == entity2)
+            return true;
+        droneController = orxonox_cast<DroneController*>(entity2->getController());
+        if (droneController && static_cast<ControllableEntity*>(droneController->getOwner()) == entity1)
+            return true;
+            
         return (team1 == team2 && team1 != -1);
     }