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

Timestamp:

Nov 27, 2015, 8:39:46 AM (8 years ago)

Author:

gania

Message:

fixed a bug and got rid of unnecessary Rank enumeration, used getIdentifire instead

File:

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

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

@@ -41 +41 @@
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
         this->myLeader_ = 0;
-        this->rank_ = Rank::WINGMAN;
         this->bFirstAction_ = true;
 
@@ -81 +80 @@
         if (!this->myLeader_)
         {
-            ActionpointController* newLeader = findNewLeader();
+            ActionpointController* newLeader = orxonox_cast<ActionpointController*> (findNewLeader());
             this->myLeader_ = newLeader;
            
@@ -172 +171 @@
         Vector3* targetRelativePosition;
 
-        if (this->myLeader_->getRank() == Rank::DIVISIONLEADER)
+        if (this->myLeader_->getIdentifier()->getName() == "DivisionController")
         {
             switch (this->formationMode_){
@@ -217 +216 @@
     }
     //----POST: closest leader that is ready to take a new wingman is returned----
-    ActionpointController* WingmanController::findNewLeader()
+    CommonController* WingmanController::findNewLeader()
     {
 
@@ -224 +223 @@
 
         //----vars for finding the closest leader----
-        ActionpointController* closestLeader = 0;
+        CommonController* closestLeader = 0;
         float minDistance =  std::numeric_limits<float>::infinity();
         Gametype* gt = this->getGametype();
-        for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>::begin(); it; ++it)
+        for (ObjectList<CommonController>::iterator it = ObjectList<CommonController>::begin(); it; ++it)
         {
             //----0ptr or not a leader or dead?----
             if (!it || 
-                (it->getRank() != Rank::SECTIONLEADER && it->getRank() != Rank::DIVISIONLEADER) || 
+                (it->getIdentifier()->getName() != "SectionController" && it->getIdentifier()->getName() != "DivisionController") || 
                 !(it->getControllableEntity()))
                 continue;
@@ -251 +250 @@
         {
             //----Racing conditions----
-            if (closestLeader->setWingman(this))
+            if (closestLeader->setWingman(orxonox_cast<CommonController*>(this)))
                 return closestLeader;
         }