Changeset 10869 for code/branches/campaignHS15/src/orxonox/controllers/DivisionController.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/DivisionController.cc (modified) (3 diffs)

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

@@ -45 +45 @@
         this->myWingman_ = 0;
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&DivisionController::action, this)));
-        this->rank_ = Rank::DIVISIONLEADER;
     }
 
@@ -107 +106 @@
         
     }
+    //I wanted to do it different here, but at this point I think nothing will change if I delete that method
     void DivisionController::stayNearProtect()
     {
@@ -112 +112 @@
     }
     
-    bool DivisionController::setWingman(ActionpointController* cwingman)
+    bool DivisionController::setWingman(CommonController* cwingman)
     {