Changeset 8793 for code/branches/ai2/src/orxonox

Timestamp:

Jul 28, 2011, 5:24:32 PM (13 years ago)

Author:

jo

Message:

Destructor update.

Location:

code/branches/ai2/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (1 diff)
• WaypointController.cc (modified) (1 diff)

code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

@@ -104 +104 @@
         if (this->isInitialized())
         {//Vector-implementation: mode_.erase(mode_.begin(),mode_.end());
-            for (size_t i = 0; i < this->waypoints_.size(); ++i)
-            {
-                if(this->waypoints_[i])
-                    this->waypoints_[i]->destroy();
-            }
-            //this->waypoints_.clear();
+            this->waypoints_.clear();
             this->removeFromFormation();
             this->weaponModes_.clear();

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

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