Finished up code for basic functionality of earthflower powerup.

[supertux.git] / src / object / player.hpp

diff --git a/src/object/player.hpp b/src/object/player.hpp
index 2e72b52..4d178aa 100644 (file)
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -180,6 +180,8 @@ public:
   bool is_dead() const
   { return dead; }
   bool is_big();
+  bool is_stone()
+  { return stone; }
 
   void set_visible(bool visible);
   bool get_visible();
@@ -274,14 +276,16 @@ private:
   int  backflip_direction;
   Direction peekingX;
   Direction peekingY;
+  float ability_time;
+  bool stone;
   bool swimming;
   float speedlimit;
   Controller* scripting_controller_old; /**< Saves the old controller while the scripting_controller is used */
   bool jump_early_apex;
   bool on_ice;
   bool ice_this_frame;
-  Color light;
   SpritePtr lightsprite;
+  SpritePtr powersprite;
 
 public:
   Direction dir;
@@ -302,6 +306,8 @@ public:
   Timer safe_timer;
   Timer kick_timer;
   Timer shooting_timer;   // used to show the arm when Tux is shooting
+  Timer ability_timer;  // maximum lengh of time that special abilities can last
+  Timer cooldown_timer; // minimum time period between successive uses of a special ability
   Timer dying_timer;
   bool growing;
   Timer backflip_timer;