Changeset 7208 for code/trunk/src/modules/pickup/items/ShieldPickup.h

Timestamp:

Aug 24, 2010, 9:49:54 AM (15 years ago)

Author:

dafrick

Message:

Removed Timer from Pickup, as this is no his core functionality.

File:

• code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) (2 diffs)

code/trunk/src/modules/pickup/items/ShieldPickup.h

@@ -80 +80 @@
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
 
-            virtual void pickupTimerCallback(void); //!< Function that gets called when timer ends.
+            void pickupTimerCallback(void); //!< Function that gets called when timer ends.
 
             void setDuration(float duration);
@@ -90 +90 @@
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
 
+            Timer durationTimer_; //!< Timer.
+
             float duration_; //!< The health that is transferred to the Pawn.
             float shieldHealth_;