Changeset 2893 for code/trunk/src/orxonox/objects/weaponSystem/weapons

Timestamp:

Apr 5, 2009, 11:27:54 PM (16 years ago)

Author:

landauf

Message:

merged weaponsystem branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -53 +53 @@
     }
 
+    void LaserGun::reloadBullet()
+    {
+        this->bulletTimer(this->bulletLoadingTime_);
+    }
+
+    void LaserGun::reloadMagazine()
+    {
+        this->magazineTimer(this->magazineLoadingTime_);
+    }
+
     void LaserGun::takeBullets()
     {
-//COUT(0) << "LaserGun::takeBullets" << std::endl;
         this->munition_->removeBullets(1);
-        this->bulletTimer(this->bulletLoadingTime_);
     }
 
@@ -63 +71 @@
     {
         this->munition_->removeMagazines(1);
-        this->magazineTimer(this->magazineLoadingTime_);
     }
 
     void LaserGun::createProjectile()
     {
-//COUT(0) << "LaserGun::createProjectile" << std::endl;
         BillboardProjectile* projectile = new ParticleProjectile(this);
         projectile->setOrientation(this->getWorldOrientation());

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -51 +51 @@
             virtual void takeMagazines();
             virtual void createProjectile();
+            virtual void reloadBullet();
+            virtual void reloadMagazine();
 
         private: