Changeset 10974 for code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Dec 14, 2015, 11:31:30 AM (8 years ago)

Author:

maxima

Message:

merged campaign and presentation

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/WingmanController.cc (modified) (3 diffs)

code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc

@@ -99 +99 @@
         else if (this->myLeader_)
         {
-            if (this->myLeader_->bKeepFormation_ || !(this->myLeader_->getAction() == Action::FIGHT || this->myLeader_->getAction() == Action::FIGHTALL
+            if (this->myLeader_->bKeepFormation_ || !(this->myLeader_->getAction() == Action::FIGHT 
+                || this->myLeader_->getAction() == Action::FIGHTALL
                 || this->myLeader_->getAction() == Action::ATTACK))
             {
@@ -148 +149 @@
         else
         {
-
             switch (this->formationMode_){
                 case FormationMode::WALL:
@@ -215 +215 @@
         {
             //----Racing conditions----
+            /*TODO: racing condition check is wrong and redundant, as there is no multithreading here, ticks get called one after another,
+            so it can be simplified to a check of whether leader got a wingman*/
             if (closestLeader->setWingman(orxonox_cast<ActionpointController*>(this)))
             {
-                if (closestLeader->getIdentifier()->getName() == "SectionController")
-                {
-                    this->actionTime_ = 1.6f;
-                }
-                else
-                {
-                    this->actionTime_ = 2.0f;
-                }
                 return closestLeader;
             }