Changeset 10885 for code/branches/campaignHS15/src/orxonox/controllers/SectionController.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/SectionController.cc (modified) (6 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Gani Aliguzhinov
  *   Co-authors:
- *      Dominik Solenicki
+ *      ...
  *
  */
@@ -96 +96 @@
         if (!myDivisionLeader_)
         {
-            LeaderController* newDivisionLeader = findNewDivisionLeader();
+            ActionpointController* newDivisionLeader = findNewDivisionLeader();
             this->myDivisionLeader_ = newDivisionLeader;
             //spread copyOrientation called equally among the division
             if (this->myDivisionLeader_)
             {
-                this->actionCounter_ = 8;
+                this->actionCounter_ = 5;
             }
         }
@@ -147 +147 @@
                      + (orient* (targetRelativePosition)));
                 //let ship finish rotating. also don't call copyOrientation to often as it is a slow function.
-                if (this->actionCounter_ % 9 == 0 && !this->bHasTargetOrientation_)
+                if (this->actionCounter_ % 6 == 0 && !this->bHasTargetOrientation_)
                     this->setAction (Action::FLY, targetAbsolutePosition, orient);
                 else
@@ -300 +300 @@
     
 
-    LeaderController* SectionController::findNewDivisionLeader()
+    ActionpointController* SectionController::findNewDivisionLeader()
     {
 
@@ -306 +306 @@
             return 0;
 
-        LeaderController* closestLeader = 0;
+        ActionpointController* closestLeader = 0;
         float minDistance =  std::numeric_limits<float>::infinity();
         //go through all pawns
-        for (ObjectList<LeaderController>::iterator it = ObjectList<LeaderController>::begin(); it; ++it)
+        for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>::begin(); it; ++it)
         {
             //0ptr or not DivisionController?
@@ -338 +338 @@
         return 0;
     }
-    bool SectionController::setWingman(ActionpointController* wingman)
-    {
-        WingmanController* newWingman = orxonox_cast<WingmanController*>(wingman);
+    bool SectionController::setWingman(ActionpointController* newWingman)
+    {
 
         if (!this->myWingman_)
         {
             this->myWingman_ = newWingman;
+            newWingman->takeActionpoints (this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
             return true;
         }