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

Timestamp:

Nov 28, 2015, 10:30:56 PM (8 years ago)

Author:

gania

Message:

added other weapons

File:

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

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Gani Aliguzhinov
  *   Co-authors:
- *      Dominik Solenicki
+ *      ...
  *
  */
@@ -96 +96 @@
     }
     
-    bool DivisionController::setWingman(ActionpointController* wingman)
+    bool DivisionController::setWingman(ActionpointController* newWingman)
     {
-
-        WingmanController* newWingman = orxonox_cast<WingmanController*>(wingman);
         if (!this->myWingman_)
         {
             this->myWingman_ = newWingman;
+            if (!this->hasFollower())
+                newWingman->takeActionpoints (this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
             return true;
         }
@@ -110 +110 @@
         }
     }
-    bool DivisionController::setFollower(ActionpointController* myFollower)
+    bool DivisionController::setFollower(ActionpointController* newFollower)
     {
-        LeaderController* newFollower = orxonox_cast<LeaderController*> (myFollower);
         if (!this->myFollower_)
         {
@@ -120 +119 @@
                 this->myWingman_->takeActionpoints (std::vector<Point>(), std::vector<Point>(), false);
             }
+
+            newFollower->takeActionpoints (this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+            
             return true;
         }