Changeset 10924 for code/branches/campaignHS15/src/orxonox/controllers

Timestamp:

Dec 7, 2015, 9:04:38 AM (9 years ago)

Author:

gania

Message:

checking in

File:

• code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) (2 diffs)

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

@@ -173 +173 @@
             }
             maneuverCounter_ += dt;
-
+        if (!this || !this->getControllableEntity())
+            return;
         //maneuver every 0.25 sec -> 
-        int step =  5;
-        if (this->hasTarget() && ActionpointController::sTicks_ % 100 == step * (this->actionpointControllerId_) + 3)
+        int step =  4;
+        if (this->hasTarget() && ActionpointController::sTicks_ % 100 == step * (this->actionpointControllerId_))
+        {
+            
+        }
+        if (ActionpointController::sTicks_ % 100 == step * this->actionpointControllerId_ + 1)
+        {
+            this->action();
+        }
+        if (!this || !this->getControllableEntity())
+            return;
+
+        
+        if (this->hasTarget() &&  ActionpointController::sTicks_ % ActionpointController::nextActionpointControllerId_ == (this->actionpointControllerId_))
         {
             if (maneuverCounter_ > 6.0f)
@@ -185 +198 @@
                 this->timeDodged_ = 0;
             }
+            if (!this || !this->getControllableEntity())
+            return;
             this->maneuver();
-        }
-        if (ActionpointController::sTicks_ % 100 == step * this->actionpointControllerId_ + 1)
-        {
-            this->action();
-        }
-        if (!this || !this->getControllableEntity())
-            return;
-
-        if (!this || !this->getControllableEntity())
-            return;
-        if (this->hasTarget() &&  ActionpointController::sTicks_ % 100 == step * (this->actionpointControllerId_))
-        {
+            if (!this || !this->getControllableEntity())
+            return;
             this->bShooting_ = this->canFire();
-            
         }
         if (!this || !this->getControllableEntity())