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

Timestamp:

Nov 26, 2015, 9:08:11 AM (9 years ago)

Author:

gania

Message:

split up some code

File:

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

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

@@ -35 +35 @@
     RegisterClass(WingmanController);
     
-    //CommonController contains all common functionality of AI Controllers
-    WingmanController::WingmanController(Context* context) : CommonController(context)
+    //ActionpointController contains all common functionality of AI Controllers
+    WingmanController::WingmanController(Context* context) : ActionpointController(context)
     {
         RegisterObject(WingmanController);
@@ -81 +81 @@
         if (!this->myLeader_)
         {
-            CommonController* newLeader = findNewLeader();
+            ActionpointController* newLeader = findNewLeader();
             this->myLeader_ = newLeader;
            
@@ -92 +92 @@
         if (!this->myLeader_)
         {
-           CommonController::action();
+           ActionpointController::action();
         }
         else if (this->myLeader_)
@@ -217 +217 @@
     }
     //----POST: closest leader that is ready to take a new wingman is returned----
-    CommonController* WingmanController::findNewLeader()
+    ActionpointController* WingmanController::findNewLeader()
     {
 
@@ -224 +224 @@
 
         //----vars for finding the closest leader----
-        CommonController* closestLeader = 0;
+        ActionpointController* closestLeader = 0;
         float minDistance =  std::numeric_limits<float>::infinity();
         Gametype* gt = this->getGametype();
-        for (ObjectList<CommonController>::iterator it = ObjectList<CommonController>::begin(); it; ++it)
+        for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>::begin(); it; ++it)
         {
             //----0ptr or not a leader or dead?----