Changeset 5831 for code/branches/core5/src/modules/weapons

Timestamp:

Sep 28, 2009, 10:48:47 PM (16 years ago)

Author:

landauf

Message:

Realized Timer doesn't have to be a template, hence merged TimerBase, Timer and StaticTimer.
Removed the object pointer from Timer for memberfunctions, use createFunctor(f, object) instead.

Location:

code/branches/core5/src/modules/weapons

Files:

• MuzzleFlash.cc (modified) (1 diff)
• MuzzleFlash.h (modified) (1 diff)
• munitions/ReplenishingMunition.cc (modified) (2 diffs)
• munitions/ReplenishingMunition.h (modified) (1 diff)
• projectiles/LightningGunProjectile.cc (modified) (1 diff)
• projectiles/LightningGunProjectile.h (modified) (1 diff)
• projectiles/Projectile.cc (modified) (1 diff)
• projectiles/Projectile.h (modified) (1 diff)
• weaponmodes/EnergyDrink.cc (modified) (1 diff)
• weaponmodes/EnergyDrink.h (modified) (1 diff)
• weaponmodes/HsW01.cc (modified) (1 diff)
• weaponmodes/HsW01.h (modified) (1 diff)

code/branches/core5/src/modules/weapons/MuzzleFlash.cc

@@ -42 +42 @@
         this->setScale(0.1f);
 
-        this->delayTimer_.setTimer(0.1f, false, this, createExecutor(createFunctor(&MuzzleFlash::destroy)));
+        this->delayTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&MuzzleFlash::destroy, this)));
     }
 }

code/branches/core5/src/modules/weapons/MuzzleFlash.h

@@ -44 +44 @@
 
         private:
-            Timer<MuzzleFlash> delayTimer_;
+            Timer delayTimer_;
     };
 }

code/branches/core5/src/modules/weapons/munitions/ReplenishingMunition.cc

@@ -44 +44 @@
         // replenishIntervall_ and replenishMunitionAmount_ will be set in the constructor of the
         // inheriting class, which comes after this constructor)
-        this->replenishingTimer_.setTimer(0.0f, false, this, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer)));
+        this->replenishingTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer, this)));
     }
 
@@ -50 +50 @@
     {
         // Initialize the timer
-        this->replenishingTimer_.setTimer(this->replenishIntervall_, true, this, createExecutor(createFunctor(&ReplenishingMunition::replenish)));
+        this->replenishingTimer_.setTimer(this->replenishIntervall_, true, createExecutor(createFunctor(&ReplenishingMunition::replenish, this)));
     }
 

code/branches/core5/src/modules/weapons/munitions/ReplenishingMunition.h

@@ -51 +51 @@
             void initializeTimer();
 
-            Timer<ReplenishingMunition> replenishingTimer_;
+            Timer replenishingTimer_;
     };
 }

code/branches/core5/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -42 +42 @@
         this->textureIndex_ = 1;
         this->maxTextureIndex_ = 8;
-        this->textureTimer_.setTimer(0.01f, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
+        this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
         
         registerVariables();

code/branches/core5/src/modules/weapons/projectiles/LightningGunProjectile.h

@@ -50 +50 @@
             unsigned int textureIndex_;
             unsigned int maxTextureIndex_;
-            Timer<LightningGunProjectile> textureTimer_;
+            Timer textureTimer_;
             std::string materialBase_;
       private:

code/branches/core5/src/modules/weapons/projectiles/Projectile.cc

@@ -61 +61 @@
             this->attachCollisionShape(shape);
 
-            this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Projectile::destroyObject, this)));
         }
     }

code/branches/core5/src/modules/weapons/projectiles/Projectile.h

@@ -66 +66 @@
             float damage_;
             bool bDestroy_;
-            Timer<Projectile> destroyTimer_;
+            Timer destroyTimer_;
     };
 }

code/branches/core5/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -54 +54 @@
         this->setMunitionName("FusionMunition");
 
-        this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&EnergyDrink::shot)));
+        this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
         this->delayTimer_.stopTimer();
     }

code/branches/core5/src/modules/weapons/weaponmodes/EnergyDrink.h

@@ -59 +59 @@
             float speed_;
             float delay_;
-            Timer<EnergyDrink> delayTimer_;
+            Timer delayTimer_;
     };
 }

code/branches/core5/src/modules/weapons/weaponmodes/HsW01.cc

@@ -54 +54 @@
         this->setMunitionName("LaserMunition");
 
-        this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&HsW01::shot)));
+        this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
     }

code/branches/core5/src/modules/weapons/weaponmodes/HsW01.h

@@ -57 +57 @@
             float speed_;
             float delay_;
-            Timer<HsW01> delayTimer_;
+            Timer delayTimer_;
     };
 }