Ice blocks (graphics are placeholders)

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

diff --git a/src/object/player.hpp b/src/object/player.hpp
index c65b689..07e62d1 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;
@@ -70,10 +70,13 @@ private:
   bool dying;
   bool backflipping;
   int  backflip_direction;
-  Direction peeking;
+  Direction peekingX, peekingY;
   bool swimming;
   float speedlimit;
   Controller* scripting_controller_old; /**< Saves the old controller while the scripting_controller is used */
+  bool jump_early_apex;
+  bool on_ice;
+  bool ice_this_frame;
 
 public:
   Direction dir;
@@ -85,7 +88,9 @@ public:
   bool on_ground_flag;
   bool jumping;
   bool can_jump;
-  bool butt_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;
 
   Timer invincible_timer;
   Timer skidding_timer;
@@ -94,7 +99,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:
@@ -128,9 +132,14 @@ public:
   {
     return dying;
   }
-  Direction peeking_direction() const
+  Direction peeking_direction_x() const
+  {
+    return peekingX;
+  }
+
+  Direction peeking_direction_y() const
   {
-    return peeking;
+    return peekingY;
   }
 
   void kill(bool completely);
@@ -189,7 +198,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);
 
@@ -197,6 +206,11 @@ public:
    * Adds velocity to the player until given end speed is reached
    */
   void add_velocity(const Vector& velocity, const Vector& end_speed);
+  
+  /**
+   * Returns the current velocity of the player
+   */
+  Vector get_velocity();
 
   void bounce(BadGuy& badguy);
 
@@ -213,6 +227,10 @@ public:
   {
       return grabbed_object;
   }
+  void stop_grabbing()
+  {
+    grabbed_object = NULL;
+  }
 
   /**
    * Switches ghost mode on/off.
@@ -267,6 +285,9 @@ private:
   void deactivate();
   void walk(float speed);
 
+  void do_jump_apex();
+  void early_jump_apex();
+
   /**
    * slows Tux down a little, based on where he's standing
    */
@@ -291,6 +312,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 */
 };