[Orxonox-commit 2349] r7064 - code/branches/presentation3/src/orxonox/controllers

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-05-31 18:06:03 +0200 (Mon, 31 May 2010)
New Revision: 7064

Modified:
   code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
Log:
fixed a bug in ArtificialController::sameTeam

Modified: code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc	2010-05-31 15:21:40 UTC (rev 7063)
+++ code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc	2010-05-31 16:06:03 UTC (rev 7064)
@@ -733,10 +733,10 @@
                 team1 = ac->getTeam();
         }
 
-        if (entity1->getController())
-            controller = entity1->getController();
+        if (entity2->getController())
+            controller = entity2->getController();
         else
-            controller = entity1->getXMLController();
+            controller = entity2->getXMLController();
         if (controller)
         {
             ArtificialController* ac = orxonox_cast<ArtificialController*>(controller);