Changeset 6728 for code/trunk/src/modules/pickup/Pickup.h

Timestamp:

Apr 15, 2010, 1:15:11 PM (14 years ago)

Author:

dafrick

Message:

No more seg faults with pickups (at least that's what I hope. )

File:

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

code/trunk/src/modules/pickup/Pickup.h

@@ -135 +135 @@
             virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
-            bool startPickupTimer(float durationTime);
+            bool startPickupTimer(float durationTime); //!< Starts the pickup duration timer.
+            /**
+            @brief Get your Timer.
+            @return Returns a pointer to the Timer.
+            */
+            inline Timer* getTimer(void)
+                { return &this->durationTimer_; }
 
+            /**
+            @brief The callback method for the Timer.
+                   Can be overloaded to implement desired functionality.
+            */
             virtual void pickupTimerCallback(void) {}
 
@@ -164 +174 @@
             pickupDurationType::Value durationType_; //!< The duration type of the pickup.
 
+            //! Strings for the activation and duration types.
             static const std::string activationTypeImmediate_s;
             static const std::string activationTypeOnUse_s;