Changeset 2366 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.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/WeaponPack.cc (modified) (3 diffs)

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

@@ -92 +92 @@
     void WeaponPack::addWeapon(Weapon * weapon)
     {
-        weapon->setParentWeaponSystem(this->parentWeaponSystem_);
-COUT(0) << "WeaponPack::addWeapon " << weapon << "   munition " << weapon->getMunitionType() << std::endl;
+COUT(0) << "WeaponPack::addWeapon:" << weapon << "   munition " << weapon->getMunitionType() << std::endl;
         this->weapons_.push_back(weapon);
     }
@@ -102 +101 @@
     }
 
-    void WeaponPack::setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
+    void WeaponPack::setParentWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
     {
         for (int i=0; i < (int) this->weapons_.size(); i++)
@@ -110 +109 @@
 
     }
+
+    void WeaponPack::attachNeededMunitionToAllWeapons()
+    {
+        for (int i=0; i < (int) this->weapons_.size(); i++)
+        {
+            this->weapons_[i]->attachNeededMunition(weapons_[i]->getMunitionType());
+        }
+
+    }
+
 }