Changeset 2852 for code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc

Timestamp:

Mar 26, 2009, 2:56:39 PM (15 years ago)

Author:

polakma

Message:

added unlimited munition, reverted shared munition and fixed some bugs

File:

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

code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -82 +82 @@
     }
 
-    void WeaponSystem::setNewSharedMunition(std::string munitionType, Munition * munitionToAdd)
-    {
-        this->munitionSharedSet_[munitionType] = munitionToAdd;
-    }
 
     //returns the Pointer to the munitionType, if this munitionType doesn't exist returns 0, see Weapon::attachNeededMunition
     Munition * WeaponSystem::getMunitionType(std::string munitionType)
     {
-        std::map<std::string, Munition *>::const_iterator it = this->munitionSharedSet_.find(munitionType);
-        if (it != this->munitionSharedSet_.end())
+        std::map<std::string, Munition *>::const_iterator it = this->munitionSet_.find(munitionType);
+        if (it != this->munitionSet_.end())
             return it->second;
         else
             return 0;
     }
-
-
-