Changeset 10861 for code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

Timestamp:

Nov 25, 2015, 8:46:09 PM (8 years ago)

Author:

gania

Message:

finished everything, demos are commented out in AITest.oxw

File:

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

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

@@ -83 +83 @@
     {   
         if (!this->isActive())
-            return;
+            return;   
         SUPER(DivisionController, tick, dt);
     }
@@ -90 +90 @@
         if (!this || !this->getControllableEntity())
             return;
+        
         CommonController::action();
+        if (!this || !this->getControllableEntity())
+            return;
+        if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
+        {
+            if (this->myFollower_)
+            {
+                this->myFollower_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+            }
+            else if (this->myWingman_)
+            {
+                this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+            }    
+        }
         
     }