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

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/weaponmodes

Files:

• EnergyDrink.cc (modified) (1 diff)
• EnergyDrink.h (modified) (1 diff)
• HsW01.cc (modified) (1 diff)
• HsW01.h (modified) (1 diff)

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_;
     };
 }