Changeset 10877 for code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

Timestamp:

Nov 27, 2015, 4:42:14 PM (9 years ago)

Author:

gania

Message:

CommonController now has static methods only. Replace with a namespace?

File:

• code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) (3 diffs)

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

@@ -49 +49 @@
     DivisionController::~DivisionController()
     {
-        // if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
-        // {
-        //     if (this->myFollower_)
-        //     {
-        //         this->myFollower_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
-        //         if (this->myWingman_)
-        //         {
-        //             this->myWingman_->setAction(Action::FIGHTALL);
-        //         }
-        //     }
-        //     else if (this->myWingman_)
-        //     {
-        //         this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
-        //     }    
-        // }
         for (size_t i = 0; i < this->actionpoints_.size(); ++i)
         {
@@ -112 +97 @@
     }
     
-    bool DivisionController::setWingman(CommonController* cwingman)
+    bool DivisionController::setWingman(ActionpointController* wingman)
     {
 
-        WeakPtr<WingmanController> wingman = orxonox_cast<WingmanController*>(cwingman);
+        WingmanController* newWingman = orxonox_cast<WingmanController*>(wingman);
         if (!this->myWingman_)
         {
-            this->myWingman_ = wingman;
+            this->myWingman_ = newWingman;
             return true;
         }
@@ -126 +111 @@
         }
     }
-    bool DivisionController::setFollower(LeaderController* myFollower)
+    bool DivisionController::setFollower(ActionpointController* myFollower)
     {
-         if (!this->myFollower_)
+        LeaderController* newFollower = orxonox_cast<LeaderController*> (myFollower);
+        if (!this->myFollower_)
         {
-            this->myFollower_ = myFollower;
+            this->myFollower_ = newFollower;
             return true;
         }