Changeset 9800 for code/trunk

Timestamp:

Nov 21, 2013, 6:59:04 PM (11 years ago)

Author:

jo

Message:

Make the AI aware of the inherent team (number) of controllable entities. (Per default it is -1 → the behaviour will only change, if an uncontrolled controllable entities team is set per XML.)

File:

• code/trunk/src/orxonox/controllers/FormationController.cc (modified) (1 diff)

code/trunk/src/orxonox/controllers/FormationController.cc

@@ -959 +959 @@
             return true;
 
-        int team1 = -1;
-        int team2 = -1;
+        int team1 = entity1->getTeam();
+        int team2 = entity2->getTeam();
 
         Controller* controller = 0;