Changeset 5831 for code/branches/core5/src/orxonox/weaponsystem/Weapon.h

Timestamp:

Sep 28, 2009, 10:48:47 PM (15 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.

File:

• code/branches/core5/src/orxonox/weaponsystem/Weapon.h (modified) (1 diff)

code/branches/core5/src/orxonox/weaponsystem/Weapon.h

@@ -71 +71 @@
             std::multimap<unsigned int, WeaponMode*> weaponmodes_;
 
-            Timer<Weapon> reloadTimer_;
+            Timer reloadTimer_;
             bool bReloading_;
             unsigned int reloadingWeaponmode_;