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

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

@@ -39 +39 @@
 namespace orxonox
 {
+    CreateFactory(WeaponSet);
+
     WeaponSet::WeaponSet(BaseObject* creator, int k) : BaseObject(creator)
     {
@@ -53 +55 @@
     void WeaponSet::attachWeaponPack(WeaponPack *wPack)
     {
+COUT(0) << "WeaponSet::attachWeaponPack" << std::endl;
         if ( this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
         {
@@ -75 +78 @@
     {
         //fires all WeaponSlots available for this weaponSet attached from the WeaponPack
+COUT(0) << "WeaponSet::fire" << std::endl;
         this->attachedWeaponPack_->fire();
     }