Changeset 2319 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSet.cc

Timestamp:

Dec 3, 2008, 3:11:48 PM (16 years ago)

Author:

polakma

Message:

fixed WeaponPack attaching

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) (1 diff)

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

@@ -53 +53 @@
     void WeaponSet::attachWeaponPack(WeaponPack *wPack)
     {
-        if (this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
+        if ( this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
         {
             this->attachedWeaponPack_ = wPack;
+            int wPackWeapon = 0;    //WeaponCounter for Attaching
             //should be possible to choose which slot to use
             for (  int i=0; i < wPack->getSize() ; i++  )
             {
                 //at the moment this function only works for one weaponPack in the entire WeaponSystem...
-                this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(i) );
-                this->parentWeaponSystem_->getWeaponSlotPointer(i)->attachWeapon( wPack->getWeaponPointer(i) );
+                if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() != 0 ) //if slot not full
+                {
+                    this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(i) );
+                    this->parentWeaponSystem_->getWeaponSlotPointer(i)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
+                    wPackWeapon++;
+                }
             }
         }