Changeset 8942 for code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Nov 18, 2011, 6:52:21 PM (13 years ago)

Author:

jo

Message:

Pawn&SpaceShip Colouring via XML works. Quick&Dirty implementation though. A clean version is going to follow.

File:

• code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc (modified) (2 diffs)

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

@@ -42 +42 @@
 #include "gametypes/TeamDeathmatch.h"
 #include "gametypes/Dynamicmatch.h"
+#include "gametypes/Mission.h"
 #include "controllers/WaypointPatrolController.h"
 #include "controllers/NewHumanController.h"
@@ -996 +997 @@
             if (entity2->getPlayer())
                 team2 = tdm->getTeam(entity2->getPlayer());
+        }
+
+        Mission* miss = orxonox_cast<Mission*>(gametype);
+        if (miss)
+        {
+            if (entity1->getPlayer())
+                team1 = miss->getTeam(entity1->getPlayer());
+
+            if (entity2->getPlayer())
+                team2 = miss->getTeam(entity2->getPlayer());
         }