converted player to new object system

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index a928556..d80daf2 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -27,11 +27,13 @@
 #include "texture.h"
 #include "collision.h"
 #include "sound.h"
+#include "moving_object.h"
+#include "drawable.h"
 #include "physic.h"
 
 /* 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 +105,16 @@ struct PlayerSprite
 extern PlayerSprite smalltux;
 extern PlayerSprite largetux;
 extern PlayerSprite firetux;
+extern PlayerSprite icetux;
 
-class Player : public GameObject
+class Player : public MovingObject, public Drawable
 {
 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 +125,7 @@ public:
 
   bool jumping;
   bool can_jump;
+  bool butt_jump;
   int frame_;
   int frame_main;
 
@@ -133,25 +138,32 @@ public:
   Physic physic;
 
 public:
+  Player(DisplayManager& display_manager);
+  virtual ~Player();
+  
   void init();
   int  key_event(SDLKey key, int state);
   void level_begin();
-  void action(double frame_ratio);
   void handle_input();
   void grabdistros();
-  void draw();
+
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  virtual void collision(const MovingObject& other_object,
+      int collision_type);
+  virtual std::string type() const
+  { return "Player"; }
+
   void collision(void* p_c_object, int c_object);
   void kill(HurtMode mode);
   void is_dying();
   bool is_dead();
   void player_remove_powerups();
-  void check_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();