- reduced jump tolleranze to two tiles

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 15291d3..3b0eabc 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -33,6 +33,7 @@
 
 #define TUX_SAFE_TIME 750
 #define TUX_INVINCIBLE_TIME 10000
+#define TUX_INVINCIBLE_TIME_WARNING 2000
 #define TIME_WARNING 20000     /* When to alert player they're low on time! */
 
 /* One-ups... */
@@ -65,6 +66,7 @@ struct player_input_type
   int right;
   int left;
   int up;
+  int old_up;
   int down;
   int fire;
   int old_fire;
@@ -75,50 +77,32 @@ void player_input_init(player_input_type* pplayer_input);
 class Sprite;
 
 extern Surface* tux_life;
-extern std::vector<Surface*> tux_right;
-extern std::vector<Surface*> tux_left;
-extern Surface* smalltux_jump_left;
-extern Surface* smalltux_jump_right;
-extern Surface* smalltux_stand_left;
-extern Surface* smalltux_stand_right;
-extern Sprite*  smalltux_skid_left;
-extern Sprite*  smalltux_skid_right;
-extern Sprite*  smalltux_gameover;
-extern Sprite*  largetux_stand_left;
-extern Sprite*  largetux_stand_right;
-
-extern Sprite*  smalltux_kick_left;
-extern Sprite*  smalltux_kick_right;
-extern Sprite*  smalltux_grab_left;
-extern Sprite*  smalltux_grab_right;
-
-extern Sprite*  largetux_kick_left;
-extern Sprite*  largetux_kick_right;
-extern Sprite*  largetux_grab_left;
-extern Sprite*  largetux_grab_right;
-
-extern Sprite* bigtux_right;
-extern Sprite* bigtux_left;
-extern Sprite* bigtux_right_jump;
-extern Sprite* bigtux_left_jump;
-extern Sprite* ducktux_right;
-extern Sprite* ducktux_left;
-extern Surface* skidtux_right;
-extern Surface* skidtux_left;
-extern Surface* firetux_right[3];
-extern Surface* firetux_left[3];
-extern Surface* bigfiretux_right[3];
-extern Surface* bigfiretux_left[3];
-extern Surface* bigfiretux_right_jump;
-extern Surface* bigfiretux_left_jump;
-extern Surface* duckfiretux_right;
-extern Surface* duckfiretux_left;
-extern Surface* skidfiretux_right;
-extern Surface* skidfiretux_left;
-extern Surface* cape_right[2];
-extern Surface* cape_left[2];
-extern Surface* bigcape_right[2];
-extern Surface* bigcape_left[2];
+
+extern Sprite* smalltux_gameover;
+extern Sprite* smalltux_star;
+extern Sprite* largetux_star;
+
+struct PlayerSprite
+{
+  Sprite* stand_left;
+  Sprite* stand_right;
+  Sprite* walk_right;
+  Sprite* walk_left;
+  Sprite* jump_right;
+  Sprite* jump_left;
+  Sprite* kick_left;
+  Sprite* kick_right;
+  Sprite* skid_right;
+  Sprite* skid_left;
+  Sprite* grab_left;
+  Sprite* grab_right;
+  Sprite* duck_right;
+  Sprite* duck_left;
+};
+
+extern PlayerSprite smalltux;
+extern PlayerSprite largetux;
+extern PlayerSprite firetux;
 
 class Player
 {
@@ -135,6 +119,7 @@ public:
   Direction dir;
 
   bool jumping;
+  bool can_jump;
   int frame_;
   int frame_main;
 
@@ -145,6 +130,7 @@ public:
   Timer skidding_timer;
   Timer safe_timer;
   Timer frame_timer;
+  Timer kick_timer;
   Physic physic;
 
 public:
@@ -163,6 +149,7 @@ public:
   void keep_in_bounds();
   bool on_ground();
   bool under_solid();
+  void grow();
   
 private:
   void handle_horizontal_input();