X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.h;h=21a00a2dc22fd4ead6f30ace9ea88b759d0c8c60;hb=5dba61177d71c5572fd29af172fcdab7b1f9a561;hp=541f1795b43b54e8ded5839be0b35f30ae7b6eae;hpb=8d35b07c0536394203ec46982c780e6ebd661cbe;p=supertux.git

diff --git a/src/player.h b/src/player.h
index 541f1795b..21a00a2dc 100644
--- a/src/player.h
+++ b/src/player.h
@@ -27,12 +27,15 @@
 #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! */
 
 /* One-ups... */
@@ -65,6 +68,7 @@ struct player_input_type
   int right;
   int left;
   int up;
+  int old_up;
   int down;
   int fire;
   int old_fire;
@@ -75,98 +79,103 @@ void player_input_init(player_input_type* pplayer_input);
 class Sprite;
 
 extern Surface* tux_life;
-extern std::vector<Surface*> tux_right;
-extern std::vector<Surface*> tux_left;
-extern Surface* smalltux_jump_left;
-extern Surface* smalltux_jump_right;
-extern Surface* smalltux_stand_left;
-extern Surface* smalltux_stand_right;
-extern Sprite*  smalltux_skid_left;
-extern Sprite*  smalltux_skid_right;
-extern Sprite*  smalltux_gameover;
-extern Sprite*  largetux_stand_left;
-extern Sprite*  largetux_stand_right;
-
-extern Sprite*  smalltux_kick_left;
-extern Sprite*  smalltux_kick_right;
-extern Sprite*  smalltux_grab_left;
-extern Sprite*  smalltux_grab_right;
-extern Sprite*  smalltux_star;
-extern Sprite*  largetux_star;
-
-extern Sprite*  largetux_kick_left;
-extern Sprite*  largetux_kick_right;
-extern Sprite*  largetux_grab_left;
-extern Sprite*  largetux_grab_right;
-
-extern Sprite* bigtux_right;
-extern Sprite* bigtux_left;
-extern Sprite* bigtux_right_jump;
-extern Sprite* bigtux_left_jump;
-extern Sprite* ducktux_right;
-extern Sprite* ducktux_left;
-extern Surface* skidtux_right;
-extern Surface* skidtux_left;
-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;
-extern Surface* cape_right[2];
-extern Surface* cape_left[2];
-extern Surface* bigcape_right[2];
-extern Surface* bigcape_left[2];
-
-class Player
+
+extern Sprite* smalltux_gameover;
+extern Sprite* smalltux_star;
+extern Sprite* largetux_star;
+extern Sprite* growingtux_left;
+extern Sprite* growingtux_right;
+
+struct PlayerSprite
+{
+  Sprite* stand_left;
+  Sprite* stand_right;
+  Sprite* walk_right;
+  Sprite* walk_left;
+  Sprite* jump_right;
+  Sprite* jump_left;
+  Sprite* kick_left;
+  Sprite* kick_right;
+  Sprite* skid_right;
+  Sprite* skid_left;
+  Sprite* grab_left;
+  Sprite* grab_right;
+  Sprite* duck_right;
+  Sprite* duck_left;
+};
+
+extern PlayerSprite smalltux;
+extern PlayerSprite largetux;
+extern PlayerSprite firetux;
+extern PlayerSprite icetux;
+
+class Player : public MovingObject, public Drawable
 {
 public:
   enum HurtMode { KILL, SHRINK };
+  enum Power { NONE_POWER, FIRE_POWER, ICE_POWER };
+  enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING };
 
   player_input_type  input;
-  bool got_coffee;
+  int got_power;
   int size;
   bool duck;
   bool holding_something;
+  bool dead;
   DyingType dying;
 
   Direction dir;
+  Direction old_dir;
+
+  float last_ground_y;
+  FallMode fall_mode;
 
   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;
+  Timer shooting_timer;   // used to show the arm when Tux is shooting
+  Timer dying_timer;
+  Timer growing_timer;
   Physic physic;
 
 public:
-  void init();
+  Player(DisplayManager& display_manager);
+  virtual ~Player();
+  
   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(Camera& viewport, int layer);
+  virtual void collision(const MovingObject& other_object,
+      int collision_type);
+
   void collision(void* p_c_object, int c_object);
   void kill(HurtMode mode);
-  void is_dying();
-  bool is_dead();
   void player_remove_powerups();
-  void keep_in_bounds();
+  void check_bounds(Camera& viewport);
   bool on_ground();
   bool under_solid();
+  bool tiles_on_air(int tiles);
+  void grow(bool animate);
+  void move(const Vector& vector);
+  bool is_dead() const
+  { return dead; }
   
 private:
+  void init();
+  
   void handle_horizontal_input();
   void handle_vertical_input();
   void remove_powerups();