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

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

@@ -46 +46 @@
 namespace orxonox
 {
+    CreateFactory(WeaponSystem);
 
     WeaponSystem::WeaponSystem(BaseObject* creator) : BaseObject(creator)
@@ -61 +62 @@
     void WeaponSystem::attachWeaponPack(WeaponPack *wPack, unsigned int firemode)
     {
+        wPack->setParentWeaponSystem(this);
         this->weaponSets_[firemode]->attachWeaponPack(wPack);
         this->weaponPacks_[firemode] = wPack;
-        wPack->setParentWeaponSystem(this);
     }
 
     void WeaponSystem::attachWeaponSlot(WeaponSlot *wSlot)
     {
+        wSlot->setParentWeaponSystem(this);
         this->weaponSlots_.push_back(wSlot);
-        wSlot->setParentWeaponSystem(this);
     }
 
     void WeaponSystem::attachWeaponSet(WeaponSet *wSet)
     {
+        wSet->setParentWeaponSystem(this);
         this->weaponSets_.push_back(wSet);
-        wSet->setParentWeaponSystem(this);
     }