reverted totally pointless commit of rmcruz. size does NOT contain the current power...

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 07e4fc9..da36ef8 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -31,8 +31,9 @@
 
 /* Times: */
 
-#define TUX_SAFE_TIME 750
+#define TUX_SAFE_TIME 1250
 #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;
@@ -100,43 +102,37 @@ struct PlayerSprite
 
 extern PlayerSprite smalltux;
 extern PlayerSprite largetux;
+extern PlayerSprite firetux;
+extern PlayerSprite icetux;
 
-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;
-
-class Player
+class Player : public GameObject
 {
 public:
   enum HurtMode { KILL, SHRINK };
+  enum Power { NONE_POWER, FIRE_POWER, ICE_POWER };
 
   player_input_type  input;
-  bool got_coffee;
+  int got_power;
   int size;
   bool duck;
   bool holding_something;
   DyingType dying;
 
   Direction dir;
+  Direction old_dir;
 
   bool jumping;
+  bool can_jump;
+  bool butt_jump;
   int frame_;
   int frame_main;
 
-  base_type  base;
-  base_type  old_base;
   base_type  previous_base;
   Timer invincible_timer;
   Timer skidding_timer;
   Timer safe_timer;
   Timer frame_timer;
+  Timer kick_timer;
   Physic physic;
 
 public:
@@ -152,9 +148,12 @@ public:
   void is_dying();
   bool is_dead();
   void player_remove_powerups();
-  void keep_in_bounds();
+  void check_bounds(bool back_scrolling, bool hor_autoscroll);
   bool on_ground();
   bool under_solid();
+  void grow();
+  
+  std::string type() { return "Player";};
   
 private:
   void handle_horizontal_input();