Changeset 6607 for code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h

Timestamp:

Mar 22, 2010, 10:45:09 PM (14 years ago)

Author:

ebeier

Message:

first working version of the SpeedPickup, needs some more work for "onUse" type. Spaceship trails need to be looked at, because they don't show when a SpeedPickup with SpeedAdd is used.

File:

• code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified) (3 diffs)

code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h

@@ -57 +57 @@
         Eric Beier
     */
-    class _PickupExport SpeedPickup : public Pickup, public Tickable
+    class _PickupExport SpeedPickup : public Pickup
     {
         public:
@@ -65 +65 @@
 
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
-            virtual void tick(float dt); //!< Is called every tick.
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
@@ -80 +79 @@
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
 
-            void setDuration(float duration); //!< Sets the duration
+            void setDuration(float duration);
             void setSpeedAdd(float speedAdd);
             void setSpeedMultiply(float speedMultiply);
 
-
         private:
             void initialize(void); //!< Initializes the member variables.
-            Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
+            void PickupTimerCallBack(void); //!< Function that gets called when timer ends.
+            Engine* carrierToEngineHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
 
             float duration_; //!< The health that is transferred to the Pawn.