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

Timestamp:

Nov 12, 2008, 4:45:50 PM (16 years ago)

Author:

polakma

Message:

added munition, fixed reloadTimer_

File:

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

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

@@ -44 +44 @@
 
         //set weapon properties here
-        this->loadingTime_ = 0.5;
+        this->setLoadingTime(0.5);
+
+        //Hack --> will be loaded by XML
+        this->attachNeededMunition("LaserGunMunition");
     }
 
@@ -51 +54 @@
     }
 
-    LaserGun::fire()
+    void LaserGun::fire()
     {
-        if { this->weaponReadyToShoot_ }
+        if ( this->getWeaponReadyToShoot() )
         {
-            this->weaponReadyToShoot_ = false;
+            this->setWeaponReadyToShoot(false);
+
+            Weapon::timer();
+
             //take munition
-            //this->pointerToMunition_->
+            this->getAttachedMunition()->decrementBullets();
 
-            this->reloadTimer_.setTimer( loadingTime_ , false , this , &this->reloaded );
-
-            BillboardProjectile* projectile = new ParticleProjectile(this);
-            projectile->setColour(this->getProjectileColour());
+            //create projectile
+            //BillboardProjectile* projectile = new ParticleProjectile(this);
+            //projectile->setColour(this->getProjectileColour());
         }
         else
         {
-            //actions, when weapon is not reloaded
+            //actions, when weapon is not reloaded if there are some
         }
     }
@@ -75 +80 @@
     }
 
+
+
 }