Changeset 10923 for code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Dec 7, 2015, 8:34:20 AM (9 years ago)

Author:

gania

Message:

check in

File:

• code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) (7 diffs)

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

@@ -70 +70 @@
         if (!this->myLeader_)
         {
-            if (this->actionTime_ == 2.0f)
+            /*if (this->actionTime_ == 2.0f)
             {
                 if (this->timeOffset_ >= 0.0f && this->timeOffset_ <= 0.8f && !this->bActionCalled_)
@@ -93 +93 @@
                     this->bActionCalled_ = false;
                 }
-            }
+            }*/
         }
         else
         {
-            if (this->timeOffset_ >= this->actionTime_ && this->timeOffset_ <= this->actionTime_ + 0.4f && !this->bActionCalled_)
+           /* if (this->timeOffset_ >= this->actionTime_ && this->timeOffset_ <= this->actionTime_ + 0.4f && !this->bActionCalled_)
             {
                 this->action();
@@ -105 +105 @@
             {
                 this->bActionCalled_ = false;
-            }
+            }*/
         }
        
@@ -114 +114 @@
     void WingmanController::action()
     {
-
+        if (!this || !this->getControllableEntity())
+            return;
         //----If no leader, find one----
         if (!this->myLeader_)
@@ -122 +123 @@
             if (this->myLeader_)
             {
-                //spread copyOrientation called equally among the division
-                if (this->myLeader_->getIdentifier()->getName() == "SectionController")
-                    this->actionCounter_ = 1;
-                else
-                    this->actionCounter_ = 4;
+               
             }
         }
@@ -137 +134 @@
         {
            ActionpointController::action();
+            if (!this || !this->getControllableEntity())
+                return;
+
         }
         else if (this->myLeader_)
@@ -170 +170 @@
             }
         }
-        this->actionCounter_ += this->actionCounter_ < 100000 ? 1 : -this->actionCounter_ ;
     }