- fixed problem with last_menu not being able to handle menues deeper than two submenues

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index f222579..49e7ec1 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -37,6 +37,8 @@
 #define SCORE_BRICK 5
 #define SCORE_DISTRO 25
 
+#include <vector>
+
 struct player_keymap_type
 {
   int jump;
@@ -58,39 +60,44 @@ struct player_input_type
 
 void player_input_init(player_input_type* pplayer_input);
 
-extern texture_type tux_life;
-extern texture_type tux_right[3];
-extern texture_type tux_left[3];
-extern texture_type bigtux_right[3];
-extern texture_type bigtux_left[3];
-extern texture_type bigtux_right_jump;
-extern texture_type bigtux_left_jump;
-extern texture_type ducktux_right;
-extern texture_type ducktux_left;
-extern texture_type skidtux_right;
-extern texture_type skidtux_left;
-extern texture_type firetux_right[3];
-extern texture_type firetux_left[3];
-extern texture_type bigfiretux_right[3];
-extern texture_type bigfiretux_left[3];
-extern texture_type bigfiretux_right_jump;
-extern texture_type bigfiretux_left_jump;
-extern texture_type duckfiretux_right;
-extern texture_type duckfiretux_left;
-extern texture_type skidfiretux_right;
-extern texture_type skidfiretux_left;
-extern texture_type cape_right[2];
-extern texture_type cape_left[2];
-extern texture_type bigcape_right[2];
-extern texture_type bigcape_left[2];
+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* 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];
 
 class Player
 {
  public:
-  player_input_type  input;
   player_keymap_type keymap;
-  int score;
-  int distros;
+
+  player_input_type  input;
   bool got_coffee;
   int size;
   bool duck;
@@ -99,22 +106,21 @@ class Player
   bool jumping;
   int frame_;
   int frame_main;
-  int lives;
-  base_type base;
-  base_type old_base;
-  base_type previous_base;
-  timer_type invincible_timer;
-  timer_type skidding_timer;
-  timer_type safe_timer;
-  timer_type frame_timer;
-  physic_type vphysic;
-  physic_type hphysic;
+
+  base_type  base;
+  base_type  old_base;
+  base_type  previous_base;
+  Timer invincible_timer;
+  Timer skidding_timer;
+  Timer safe_timer;
+  Timer frame_timer;
+  Physic physic;
 
  public:
   void init();
   int  key_event(SDLKey key, int state);
   void level_begin();
-  void action();
+  void action(double frame_ratio);
   void handle_input();
   void grabdistros();
   void draw();
@@ -126,8 +132,9 @@ class Player
   void keep_in_bounds();
   bool on_ground();
   bool under_solid();
+  
  private:
-  void handle_horizontal_input(int dir);
+  void handle_horizontal_input();
   void handle_vertical_input();
   void remove_powerups();
 };