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

Timestamp:

Dec 9, 2008, 5:44:34 PM (15 years ago)

Author:

polakma

Message:

fixed some pointer bugs

File:

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

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

@@ -62 +62 @@
     void WeaponSystem::attachWeaponPack(WeaponPack *wPack, unsigned int firemode)
     {
-        wPack->setParentWeaponSystem(this);
         if (firemode < this->weaponSets_.size())
             this->weaponSets_[firemode]->attachWeaponPack(wPack);
@@ -88 +87 @@
     Munition * WeaponSystem::getMunitionType(std::string munitionType)
     {
+COUT(0) << "WeaponSystem::getMunitionType " << munitionType << std::endl;
         std::map<std::string, Munition *>::const_iterator it = this->munitionSet_.find(munitionType);
         if (it != this->munitionSet_.end())