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

Timestamp:

Nov 27, 2015, 8:39:46 AM (10 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/SectionController.cc (modified) (3 diffs)

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

@@ -47 +47 @@
         this->myWingman_ = 0;
         this->myDivisionLeader_ = 0;
-        this->rank_ = Rank::SECTIONLEADER;
         this->bFirstAction_ = true;
         //orxout(internal_error) << this << "Was created" << endl;
@@ -285 +284 @@
         {
             //0ptr or not DivisionController?
-            if (!(it) || !((it)->getRank() == Rank::DIVISIONLEADER) || !(it->getControllableEntity()))
+            if (!(it) || !((it)->getIdentifier()->getName() == "DivisionController") || !(it->getControllableEntity()))
                 continue;
             //same team?
@@ -311 +310 @@
         return 0;
     }
-    bool SectionController::setWingman(ActionpointController* cwingman)
+    bool SectionController::setWingman(CommonController* cwingman)
     {
         WeakPtr<WingmanController> wingman = orxonox_cast<WingmanController*>(cwingman);