Minor #include optimization

[supertux.git] / src / object / player.hpp

diff --git a/src/object/player.hpp b/src/object/player.hpp
index afe93e4..91a1fcf 100644 (file)
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -44,7 +44,7 @@ class Climbable;
 
 /* Times: */
 static const float TUX_SAFE_TIME = 1.8f;
-static const float TUX_INVINCIBLE_TIME = 10.0f;
+static const float TUX_INVINCIBLE_TIME = 14.0f;
 static const float TUX_INVINCIBLE_TIME_WARNING = 2.0f;
 static const float GROWING_TIME = 0.35f;
 static const int GROWING_FRAMES = 7;
@@ -86,6 +86,7 @@ public:
   bool on_ground_flag;
   bool jumping;
   bool can_jump;
+  Timer jump_button_timer; /**< started when player presses the jump button; runs until Tux jumps or JUMP_GRACE_TIME runs out */
   bool wants_buttjump;
   bool does_buttjump;
 
@@ -96,7 +97,6 @@ public:
   Timer shooting_timer;   // used to show the arm when Tux is shooting
   Timer dying_timer;
   bool growing;
-  Timer idle_timer;
   Timer backflip_timer;
 
 public:
@@ -196,7 +196,7 @@ public:
   void do_jump(float yspeed);
 
   /**
-   * Adds velocity to the player (be carefull when using this)
+   * Adds velocity to the player (be careful when using this)
    */
   void add_velocity(const Vector& velocity);
 
@@ -225,6 +225,10 @@ public:
   {
       return grabbed_object;
   }
+  void stop_grabbing()
+  {
+    grabbed_object = NULL;
+  }
 
   /**
    * Switches ghost mode on/off.
@@ -306,6 +310,9 @@ private:
 
   Timer unduck_hurt_timer; /**< if Tux wants to stand up again after ducking and cannot, this timer is started */
 
+  Timer idle_timer;
+  unsigned int idle_stage;
+
   Climbable* climbing; /**< Climbable object we are currently climbing, null if none */
 };