Changeset 5801 for code/branches/core5/src/orxonox/weaponsystem

Timestamp:

Sep 26, 2009, 10:25:03 PM (16 years ago)

Author:

landauf

Message:

replaced delete with destroy() in orxonox

Location:

code/branches/core5/src/orxonox/weaponsystem

Files:

• Weapon.cc (modified) (1 diff)
• WeaponPack.cc (modified) (1 diff)
• WeaponSystem.cc (modified) (1 diff)

code/branches/core5/src/orxonox/weaponsystem/Weapon.cc

@@ -62 +62 @@
 
             for (std::multimap<unsigned int, WeaponMode*>::iterator it = this->weaponmodes_.begin(); it != this->weaponmodes_.end(); ++it)
-                delete it->second;
+                it->second->destroy();
         }
     }

code/branches/core5/src/orxonox/weaponsystem/WeaponPack.cc

@@ -54 +54 @@
 
             while (!this->weapons_.empty())
-                delete (*this->weapons_.begin());
+                (*this->weapons_.begin())->destroy();
 
             for (std::set<DefaultWeaponmodeLink*>::iterator it = this->links_.begin(); it != this->links_.end(); )
-                delete (*(it++));
+                (*(it++))->destroy();
         }
     }

code/branches/core5/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -62 +62 @@
 
             while (!this->weaponSets_.empty())
-                delete (this->weaponSets_.begin()->second);
+                this->weaponSets_.begin()->second->destroy();
 
             while (!this->weaponPacks_.empty())
-                delete (*this->weaponPacks_.begin());
+                (*this->weaponPacks_.begin())->destroy();
 
             while (!this->weaponSlots_.empty())
-                delete (*this->weaponSlots_.begin());
+                (*this->weaponSlots_.begin())->destroy();
 
             while (!this->munitions_.empty())
-                { delete (this->munitions_.begin()->second); this->munitions_.erase(this->munitions_.begin()); }
+                { this->munitions_.begin()->second->destroy(); this->munitions_.erase(this->munitions_.begin()); }
         }
     }