Changeset 6686 for code/branches/dynamicmatch/src/orxonox/controllers

Timestamp:

Apr 12, 2010, 2:52:45 PM (15 years ago)

Author:

jo

Message:

first version- not playable yet

File:

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

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

@@ -34 +34 @@
 #include "worldentities/pawns/TeamBaseMatchBase.h"
 #include "gametypes/TeamDeathmatch.h"
+#include "gametypes/Dynamicmatch.h"
 #include "controllers/WaypointPatrolController.h"
+
 
 namespace orxonox
@@ -244 +246 @@
             }
         }
-
-        return (team1 == team2 && team1 != -1);
-    }
+        Dynamicmatch* dynamic = orxonox_cast<Dynamicmatch*>(gametype);
+        if (dynamic)
+        {
+            if (entity1->getPlayer())
+                team1 = dynamic->getParty(entity1->getPlayer());
+
+            if (entity2->getPlayer())
+                team2 = dynamic->getParty(entity2->getPlayer());
+        }
+
+        return (team1 == team2 && team1 != -1)&&(!dynamic->onlyChasers); //returns false if players are in the same party and there is a victim
+    }                                                           //-> if there is no victim or the AI-Player is not in the same team the AI attacks
 }