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

Timestamp:

Nov 30, 2015, 4:04:16 PM (8 years ago)

Author:

gania

Message:

commented some stuff

File:

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

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

@@ -122 +122 @@
         this->deltaHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth() - this->previousHp;
         this->previousHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth();
-        if (this->actionCounter_ % 2 == 0)
-            this->startAttackingEnemiesThatAreClose();
+        // if (this->actionCounter_ % 2 == 0)
         //No action -> pop one from stack
         if (this->action_ == Action::NONE || this->bTakenOver_)
@@ -133 +132 @@
             //     this->parsedActionpoints_.push_back(point);
             // }
+            this->startAttackingEnemiesThatAreClose();
+
             if (this->parsedActionpoints_.empty() && this->loopActionpoints_.empty())
             {
@@ -209 +210 @@
         else if (this->action_ == Action::FLY)
         {
+            this->startAttackingEnemiesThatAreClose();            
             if (this->squaredDistanceToTarget() <= this->squaredaccuracy_)
             {
@@ -217 +219 @@
         else if (this->action_ == Action::PROTECT)
         {
+            this->startAttackingEnemiesThatAreClose();            
             if (!this->getProtect())
             {
@@ -226 +229 @@
         else if (this->action_ == Action::ATTACK)
         {   
+            this->startAttackingEnemiesThatAreClose();            
             if (!this->hasTarget())
             {