Changeset 10184 for code/branches/pickupsFS14/src/modules/jump/JumpFigure.h

Timestamp:

Dec 17, 2014, 3:43:07 PM (9 years ago)

Author:

fvultier

Message:

Es wird nun angezeigt, wie lange ein item noch aktiv ist.

File:

• code/branches/pickupsFS14/src/modules/jump/JumpFigure.h (modified) (3 diffs)

code/branches/pickupsFS14/src/modules/jump/JumpFigure.h

@@ -31 +31 @@
 
 #include "jump/JumpPrereqs.h"
-
 #include "worldentities/ControllableEntity.h"
 
@@ -119 +118 @@
 
             bool fireSignal_;
-            bool rocketActive_;
-            bool propellerActive_;
             bool dead_;
+
+            JumpRocket* rocketActive_;
+            JumpPropeller* propellerActive_;
+            JumpBoots* bootsActive_;
+            JumpShield* shieldActive_;
         private:
             std::string modelLeftHand_;
@@ -149 +151 @@
             bool animateHands_;
             bool turnUp_;
-            bool bootsActive_;
-            bool shieldActive_;
             float rocketSpeed_;
             float propellerSpeed_;