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

Timestamp:

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

Author:

gania

Message:

almost all works now, check AITest.oxw

File:

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

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

@@ -50 +50 @@
     DivisionController::~DivisionController()
     {
-        if (this->myFollower_)
-        {
-            this->myFollower_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
-            if (this->myWingman_)
-            {
-                this->myWingman_->setAction(Action::FIGHTALL);
-            }
-        }
-        else if (this->myWingman_)
-        {
-            this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
-        }
+        // if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
+        // {
+        //     if (this->myFollower_)
+        //     {
+        //         this->myFollower_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+        //         if (this->myWingman_)
+        //         {
+        //             this->myWingman_->setAction(Action::FIGHTALL);
+        //         }
+        //     }
+        //     else if (this->myWingman_)
+        //     {
+        //         this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+        //     }    
+        // }
         for (size_t i = 0; i < this->actionpoints_.size(); ++i)
         {
@@ -85 +88 @@
     void DivisionController::action()
     {   
+        if (!this || !this->getControllableEntity())
+            return;
         CommonController::action();
+        
     }
     void DivisionController::stayNearProtect()