[Orxonox-commit 5135] r9800 - code/trunk/src/orxonox/controllers

[jo at orxonox.net]

Author: jo
Date: 2013-11-21 18:59:04 +0100 (Thu, 21 Nov 2013)
New Revision: 9800

Modified:
   code/trunk/src/orxonox/controllers/FormationController.cc
Log:
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.)

Modified: code/trunk/src/orxonox/controllers/FormationController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/FormationController.cc	2013-11-21 17:37:34 UTC (rev 9799)
+++ code/trunk/src/orxonox/controllers/FormationController.cc	2013-11-21 17:59:04 UTC (rev 9800)
@@ -958,8 +958,8 @@
         if (entity1 == entity2)
             return true;
 
-        int team1 = -1;
-        int team2 = -1;
+        int team1 = entity1->getTeam();
+        int team2 = entity2->getTeam();
 
         Controller* controller = 0;
         if (entity1->getController())