Optimized gradient when top color is the same as the bottom one.

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 4271c4f..dedc6b1 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -20,19 +20,22 @@
 #ifndef SUPERTUX_PLAYER_H
 #define SUPERTUX_PLAYER_H
 
-#include <SDL.h>
+#include "SDL.h"
+
 #include "bitmask.h"
 #include "type.h"
 #include "timer.h"
-#include "texture.h"
+#include "screen/texture.h"
 #include "collision.h"
 #include "sound.h"
+#include "moving_object.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... */
@@ -50,6 +53,7 @@ struct PlayerKeymap
 {
 public:
   int jump;
+  int activate;
   int duck;
   int left;
   int right;
@@ -65,14 +69,17 @@ struct player_input_type
   int right;
   int left;
   int up;
+  int old_up;
   int down;
   int fire;
   int old_fire;
+  int activate;
 };
 
 void player_input_init(player_input_type* pplayer_input);
 
 class Sprite;
+class Camera;
 
 extern Surface* tux_life;
 
@@ -80,6 +87,11 @@ extern Sprite* smalltux_gameover;
 extern Sprite* smalltux_star;
 extern Sprite* largetux_star;
 
+#define GROWING_TIME 1000
+#define GROWING_FRAMES 7
+extern Surface* growingtux_left[GROWING_FRAMES];
+extern Surface* growingtux_right[GROWING_FRAMES];
+
 struct PlayerSprite
 {
   Sprite* stand_left;
@@ -96,57 +108,84 @@ struct PlayerSprite
   Sprite* grab_right;
   Sprite* duck_right;
   Sprite* duck_left;
+  Sprite* stomp;
 };
 
 extern PlayerSprite smalltux;
 extern PlayerSprite largetux;
 extern PlayerSprite firetux;
+extern PlayerSprite icetux;
 
-class Player
+class Player : public MovingObject
 {
 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;
+  Timer stomp_timer;
   Physic physic;
+  
+  Vector stomp_pos;
 
 public:
-  void init();
+  Player();
+  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(DrawingContext& context);
+  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* camera);
   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();