Changeset 6078 for code/branches/particles2/src/orxonox/weaponsystem/WeaponSystem.cc

Timestamp:

Nov 17, 2009, 1:36:21 AM (14 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

File:

• code/branches/particles2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)

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