Changeset 2327 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc

Timestamp:

Dec 3, 2008, 4:30:13 PM (15 years ago)

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer bugs

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) (3 diffs)

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

@@ -39 +39 @@
 namespace orxonox
 {
+    CreateFactory(WeaponPack);
+
     WeaponPack::WeaponPack(BaseObject* creator) : BaseObject(creator)
     {
@@ -66 +68 @@
         for (int i=0; i < (int) this->weapons_.size(); i++)
         {
-COUT(0) << "WeaponPack::fire"<< i << std::endl;
+COUT(0) << "WeaponPack::fire (attached from WeaponSet)"<< i << std::endl;
             this->weapons_[i]->fire();
         }
@@ -94 +96 @@
     void WeaponPack::addWeapon(Weapon * weapon)
     {
+        weapon->setParentWeaponSystem(this->parentWeaponSystem_);
         this->weapons_.push_back(weapon);
     }