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

Timestamp:

Nov 19, 2008, 7:07:36 PM (16 years ago)

Author:

polakma

Message:

added new features to munition.h and weapon.h. tried to fix projectiles (still doesn't compile)

File:

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

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

@@ -44 +44 @@
 
         //set weapon properties here
-        this->setLoadingTime(0.5);
+        //this->setLoadingTime(0.5);
 
         //Hack --> will be loaded by XML
@@ -56 +56 @@
     void LaserGun::fire()
     {
-        if ( this->getWeaponReadyToShoot() )
+        if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {
-            this->setWeaponReadyToShoot(false);
 
-            Weapon::timer();
+
 
             //take munition
-            this->getAttachedMunition()->decrementBullets();
+            this->getAttachedMunition()->removeBullets(1,this);
+            Weapon::bulletTimer();
+            this->setBulletReadyToShoot(false);
 
             //create projectile
-            //BillboardProjectile* projectile = new ParticleProjectile(this);
+            BillboardProjectile* projectile = new ParticleProjectile(this,this);
             //projectile->setColour(this->getProjectileColour());
         }