Changeset 6078 for code/branches/particles2/src/orxonox/weaponsystem

Timestamp:

Nov 17, 2009, 1:36:21 AM (15 years ago)

Author:

landauf

Message:

delete weaponpacks which were defined in xml but don't fit onto the weaponslots (in the future we could put them into the inventory).

+ some small changes

Location:

code/branches/particles2/src/orxonox/weaponsystem

Files:

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

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

@@ -96 +96 @@
             return;
 
-        assert( std::find(this->weapons_.begin(), this->weapons_.end(), weapon)!=this->weapons_.end() );
-        this->weapons_.erase( std::find(this->weapons_.begin(), this->weapons_.end(), weapon) );
+        std::vector<Weapon*>::iterator it = std::find(this->weapons_.begin(), this->weapons_.end(), weapon);
+        assert(it != this->weapons_.end());
+        this->weapons_.erase(it);
         weapon->setWeaponPack(0);
     }

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

@@ -221 +221 @@
 
         // Remove the WeaponPack from the WeaponSystem
-        assert( std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(),wPack)!=this->weaponPacks_.end() );
-        this->weaponPacks_.erase( std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(),wPack) );
+        std::vector<WeaponPack*>::iterator it = std::find(this->weaponPacks_.begin(),this->weaponPacks_.end(), wPack);
+        assert(it !=this->weaponPacks_.end());
+        this->weaponPacks_.erase(it);
     }