Changeset 2331 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

Timestamp:

Dec 3, 2008, 5:13:34 PM (15 years ago)

Author:

polakma

Message:

fixed attaching

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (2 diffs)

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

@@ -63 +63 @@
     {
         wPack->setParentWeaponSystem(this);
-        this->weaponSets_[firemode]->attachWeaponPack(wPack);
-        this->weaponPacks_[firemode] = wPack;
+        if (firemode < this->weaponSets_.size())
+            this->weaponSets_[firemode]->attachWeaponPack(wPack);
+        this->weaponPacks_.push_back(wPack);
     }
 
@@ -85 +86 @@
     Munition * WeaponSystem::getMunitionType(std::string munitionType)
     {
-        return this->munitionSet_[munitionType];
+        std::map<std::string, Munition *>::const_iterator it = this->munitionSet_.find(munitionType);
+        if (it != this->munitionSet_.end())
+            return it->second;
+        else
+            return 0;
     }