Don't show selection cursor when help is being displayed.

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index ef3df44..1de3207 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... */
@@ -103,7 +104,7 @@ extern PlayerSprite smalltux;
 extern PlayerSprite largetux;
 extern PlayerSprite firetux;
 
-class Player
+class Player : public GameObject
 {
 public:
   enum HurtMode { KILL, SHRINK };
@@ -116,13 +117,13 @@ public:
   DyingType dying;
 
   Direction dir;
+  Direction old_dir;
 
   bool jumping;
+  bool can_jump;
   int frame_;
   int frame_main;
 
-  base_type  base;
-  base_type  old_base;
   base_type  previous_base;
   Timer invincible_timer;
   Timer skidding_timer;
@@ -144,11 +145,13 @@ 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();
   void handle_vertical_input();