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 1de3207..da36ef8 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -31,7 +31,7 @@
 
 /* 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! */
@@ -103,14 +103,16 @@ struct PlayerSprite
 extern PlayerSprite smalltux;
 extern PlayerSprite largetux;
 extern PlayerSprite firetux;
+extern PlayerSprite icetux;
 
 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;
@@ -121,6 +123,7 @@ public:
 
   bool jumping;
   bool can_jump;
+  bool butt_jump;
   int frame_;
   int frame_main;