Changeset 10260 for code/trunk/src/modules/jump/JumpFigure.h
- Timestamp:
- Feb 6, 2015, 11:03:00 PM (9 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pickupsFS14 merged: 10184
- Property svn:mergeinfo changed
-
code/trunk/src/modules/jump/JumpFigure.h
r10215 r10260 31 31 32 32 #include "jump/JumpPrereqs.h" 33 34 33 #include "worldentities/ControllableEntity.h" 35 34 … … 119 118 120 119 bool fireSignal_; 121 bool rocketActive_;122 bool propellerActive_;123 120 bool dead_; 121 122 JumpRocket* rocketActive_; 123 JumpPropeller* propellerActive_; 124 JumpBoots* bootsActive_; 125 JumpShield* shieldActive_; 124 126 private: 125 127 std::string modelLeftHand_; … … 149 151 bool animateHands_; 150 152 bool turnUp_; 151 bool bootsActive_;152 bool shieldActive_;153 153 float rocketSpeed_; 154 154 float propellerSpeed_;
Note: See TracChangeset
for help on using the changeset viewer.