Changeset 8793 for code

Timestamp:

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

Author:

jo

Message:

Destructor update.

Location:

code/branches/ai2

Files:

• data/levels/lastTeamStanding.oxw (modified) (1 diff)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)
• src/orxonox/controllers/WaypointController.cc (modified) (1 diff)

code/branches/ai2/data/levels/lastTeamStanding.oxw

@@ -47 +47 @@
     </StaticEntity>
 
-    <PickupSpawner position="-160,65,10" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=mediuminvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <PickupSpawner position="-160,60,17" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
+    <PickupSpawner position="-160,60,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
       <pickup>
         <InvisiblePickup template=hugeinvisiblepickup />

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();
+        }
     }