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

Timestamp:

Nov 27, 2015, 4:42:14 PM (8 years ago)

Author:

gania

Message:

CommonController now has static methods only. Replace with a namespace?

File:

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

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

@@ -31 +31 @@
 #include "core/XMLPort.h"
 #include <algorithm>
+#include "worldentities/Actionpoint.h"
 
 
@@ -38 +39 @@
     RegisterClass(ActionpointController);
 
-    //CommonController contains all common functionality of AI Controllers
     ActionpointController::ActionpointController(Context* context) : FightingController(context)
     {
-              this->bInLoop_ = false;
+        this->bInLoop_ = false;
         this->bLoop_ = false;
         this->bEndLoop_ = false;
@@ -48 +48 @@
         this->action_ = Action::NONE;
         this->squaredaccuracy_ = 2500;
-
+        this->bFirstTick_ = true;
 
         RegisterObject(ActionpointController);
@@ -559 +559 @@
         if (this->action_ != Action::FIGHT && this->action_ != Action::FIGHTALL)
         {
-            if ( (this->target_ && this->distance (this->getControllableEntity(), this->target_) > this->attackRange_) 
+            if ( (this->target_ && CommonController::distance (this->getControllableEntity(), this->target_) > this->attackRange_) 
                 || !this->target_ )
             {
                 Pawn* newTarget = this->closestTarget();
                 if ( newTarget && 
-                    this->distance (this->getControllableEntity(), static_cast<ControllableEntity*>(newTarget))
+                    CommonController::distance (this->getControllableEntity(), static_cast<ControllableEntity*>(newTarget))
                         <= this->attackRange_ )
                 {
-                    Point p = { Action::FIGHT, this->getName(newTarget), Vector3::ZERO, false };
+                    Point p = { Action::FIGHT, CommonController::getName(newTarget), Vector3::ZERO, false };
                     this->parsedActionpoints_.push_back(p);
                     this->executeActionpoint();