Changeset 5935 for code/branches/pickup/src/modules/weapons/weaponmodes/EnergyDrink.h

Timestamp:

Oct 13, 2009, 5:05:17 PM (16 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/EnergyDrink.h (modified) (1 diff)

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

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