Changeset 7751 for code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

Timestamp:

Dec 9, 2010, 12:45:33 PM (13 years ago)

Author:

dafrick

Message:

Boost now runs out (and reloads).
Also fixed a few typos.

File:

• code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) (4 diffs)

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -34 +34 @@
 #include <string>
 #include <LinearMath/btVector3.h>
+#include "tools/Timer.h"
 #include "util/Math.h"
 #include "Pawn.h"
@@ -69 +70 @@
                 { return this->steering_; }
 
-            inline void setBoost(bool bBoost)
-                { this->bBoost_ = bBoost; }
+            void setBoost(bool bBoost);
             inline bool getBoost() const
                 { return this->bBoost_; }
@@ -89 +89 @@
 
             bool bBoost_;
+            bool bBoostCooldown_;
             bool bPermanentBoost_;
+            float boostPower_;
+            float initialBoostPower_;
+            float boostRate_;
+            float boostPowerRate_;
+            float boostCooldownDuration_;
             Vector3 steering_;
             float primaryThrust_;
@@ -102 +108 @@
 
             void loadEngineTemplate();
+            
+            void boostCooledDown(void);
 
             std::string enginetemplate_;
             Engine* engine_;
+            Timer timer_;
     };
 }