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

Timestamp:

Dec 10, 2008, 5:30:39 PM (15 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:

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

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

@@ -68 +68 @@
             {
                 //at the moment this function only works for one weaponPack in the entire WeaponSystem...
-                if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() != 0 ) //if slot not full
+                if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() == 0 ) //if slot not full
                 {
                     this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(i) );