Changeset 11054 for code/branches/cpp11_v3/src/orxonox/controllers/WaypointController.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/WaypointController.cc (modified) (1 diff)

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

@@ -44 +44 @@
     WaypointController::~WaypointController()
     {
-        for (size_t i = 0; i < this->waypoints_.size(); ++i)
+        for (WorldEntity* waypoint : this->waypoints_)
         {
-            if(this->waypoints_[i])
-                this->waypoints_[i]->destroy();
+            if(waypoint)
+                waypoint->destroy();
         }
     }