Changeset 11065 for code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc

Timestamp:

Jan 17, 2016, 1:59:00 PM (9 years ago)

Author:

landauf

Message:

added c++11 features to code that was added in presentationHS15

File:

• code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc (modified) (1 diff)

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

@@ -40 +40 @@
         RegisterObject(DivisionController);
         this->setFormationMode(FormationMode::DIAMOND);
-        this->target_ = 0;
-        this->myFollower_ = 0;
-        this->myWingman_ = 0;
+        this->target_ = nullptr;
+        this->myFollower_ = nullptr;
+        this->myWingman_ = nullptr;
     }
 
     DivisionController::~DivisionController()
     {
-        for (size_t i = 0; i < this->actionpoints_.size(); ++i)
+        for (WorldEntity* actionpoint : this->actionpoints_)
         {
-            if(this->actionpoints_[i])
-                this->actionpoints_[i]->destroy();
+            if (actionpoint)
+                actionpoint->destroy();
         }
         this->parsedActionpoints_.clear();