Changeset 10838 for code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Nov 23, 2015, 3:50:59 PM (8 years ago)

Author:

gania

Message:

Gani changed something

File:

• code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) (2 diffs)

code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

@@ -135 +135 @@
         CommonController* closestLeader = 0;
         float minDistance =  std::numeric_limits<float>::infinity();
-
+        Gametype* gt = this->getGametype();
         for (ObjectList<CommonController>::iterator it = ObjectList<CommonController>::begin(); it; ++it)
         {
@@ -145 +145 @@
             
             //----same team?----
-            if ( !CommonController::sameTeam (this->getControllableEntity(), (it)->getControllableEntity()) )
+            if ( !CommonController::sameTeam (this->getControllableEntity(), (it)->getControllableEntity(), gt) )
                 continue;