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

Timestamp:

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

Author:

gania

Message:

check in

File:

• code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) (6 diffs)

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

@@ -74 +74 @@
    
         SUPER(SectionController, tick, dt);
-        if (this->timeOffset_ > 0.8f && this->timeOffset_ <= 1.6f && !this->bActionCalled_)
+        /*if (this->timeOffset_ > 0.8f && this->timeOffset_ <= 1.6f && !this->bActionCalled_)
         {
             this->action();
@@ -82 +82 @@
         {
             this->bActionCalled_ = false;
-        }
+        }*/
 
     }
@@ -97 +97 @@
             this->myDivisionLeader_ = newDivisionLeader;
             //spread copyOrientation called equally among the division
-            if (this->myDivisionLeader_)
-            {
-                this->actionCounter_ = 5;
-            }
+
         }
         //----If have leader----
@@ -156 +153 @@
         }
 
-        this->actionCounter_ += this->actionCounter_ < 100000 ? 1 : -this->actionCounter_ ;
     }
 
@@ -166 +162 @@
         //----If division leader fights, cover him by fighting emenies close to his target----
         Action::Value action = this->myDivisionLeader_->getAction();
-        
-        Pawn* target;
+
         if (action == Action::FIGHT || action == Action::FIGHTALL || action == Action::ATTACK)
         {
+            Pawn* target;
             //----if he has a target----
             if (this->myDivisionLeader_->hasTarget())
@@ -177 +173 @@
                     !( this->hasTarget() && this->getTarget() != this->myDivisionLeader_->getTarget() ) )
                 {
-
                     bool foundTarget = false;
                     //----new target should be close to division's target----