Changeset 10968 for code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc

Timestamp:

Dec 11, 2015, 3:16:48 PM (8 years ago)

Author:

gania

Message:

a little clean up

File:

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

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

@@ -53 +53 @@
         this->bDefaultPatrol_ = true;
         this->bDefaultFightAll_ = true;
-        this->stop_ = false;
         RegisterObject(ActionpointController);
 
@@ -75 +74 @@
     void ActionpointController::tick(float dt)
     {
-        if (!this || !this->getControllableEntity() || !this->isActive() || this->stop_)
+        if (!this || !this->getControllableEntity() || !this->isActive())
             return;
 
@@ -733 +732 @@
         if (!this || !this->getControllableEntity())
             return;
-
-        //if (this->action_ != Action::FIGHT && this->action_ != Action::FIGHTALL)
-        {
-            if (!this->target_ || (this->target_ && CommonController::distance (this->getControllableEntity(), this->target_) > this->attackRange_))
-            {
-                if (!this || !this->getControllableEntity())
-                    return;
-                Pawn* newTarget = this->closestTarget();
-                if ( newTarget && 
-                    CommonController::distance (this->getControllableEntity(), static_cast<ControllableEntity*>(newTarget))
-                        <= this->attackRange_ )
-                {
-                    if (!this || !this->getControllableEntity())
-                        return;
-                    this->setTarget(newTarget);
-                    if (this->bLoop_ && !this->bPatrolling_)
-                    {
-                        Point p = { Action::FIGHT, "", Vector3::ZERO, true };
-                        this->loopActionpoints_.push_back(p);
-                    }
-                    else if (!this->bPatrolling_)
-                    {
-                        //orxout (internal_error) << "found new target " << CommonController::getName(newTarget) <<endl;
-                        Point p = { Action::FIGHT, "", Vector3::ZERO, false };
-                        this->parsedActionpoints_.push_back(p);
-                    }
-                    this->bPatrolling_ = true;
-                    this->executeActionpoint();
-                }
+        
+        if (!this->target_ || (this->target_ && CommonController::distance (this->getControllableEntity(), this->target_) > this->attackRange_))
+        {
+            if (!this || !this->getControllableEntity())
+                return;
+            Pawn* newTarget = this->closestTarget();
+            if ( newTarget && 
+                CommonController::distance (this->getControllableEntity(), static_cast<ControllableEntity*>(newTarget))
+                    <= this->attackRange_ )
+            {
+                if (!this || !this->getControllableEntity())
+                    return;
+                this->setTarget(newTarget);
+                if (this->bLoop_ && !this->bPatrolling_)
+                {
+                    Point p = { Action::FIGHT, "", Vector3::ZERO, true };
+                    this->loopActionpoints_.push_back(p);
+                }
+                else if (!this->bPatrolling_)
+                {
+                    Point p = { Action::FIGHT, "", Vector3::ZERO, false };
+                    this->parsedActionpoints_.push_back(p);
+                }
+                this->bPatrolling_ = true;
+                this->executeActionpoint();
             }
         }