Changeset 2337 for code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons

Timestamp:

Dec 3, 2008, 6:26:53 PM (16 years ago)

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer for all WeaponPacks and its Weapons

File:

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

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -61 +61 @@
         if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {
+COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;    
             //take munition
-            this->getAttachedMunition()->removeBullets(1,this);
+            this->getAttachedMunition(this->munitionType_)->removeBullets(1,this);
             Weapon::bulletTimer();
             this->setBulletReadyToShoot(false);