Changeset 10859 for code/branches/campaignHS15/src/orxonox/controllers/SectionController.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/SectionController.cc (modified) (2 diffs)

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

@@ -51 +51 @@
     SectionController::~SectionController()
     {
-        if (this->myWingman_)
-        {
-            this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
-        }
+        // if (this->myWingman_)
+        // {
+        //     this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+        // }
        for (size_t i = 0; i < this->actionpoints_.size(); ++i)
         {
@@ -82 +82 @@
     void SectionController::action()
     {
+        if (!this || !this->getControllableEntity())
+            return;
 
         //----If no leader, find one----