X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplayer.h;h=e76b93b0ec47dc9ede2b822fe2b8807bfd69931c;hb=6c61f312a1f5a768e202195ca18ed5a51974bdcc;hp=8c2e342c49aff26695856c837d82f6aa110751c5;hpb=f04a9e2da0f536ef0bf8fee7347fec9d48ea5d93;p=supertux.git

diff --git a/src/player.h b/src/player.h
index 8c2e342c4..e76b93b0e 100644
--- a/src/player.h
+++ b/src/player.h
@@ -20,21 +20,27 @@
 #ifndef SUPERTUX_PLAYER_H
 #define SUPERTUX_PLAYER_H
 
-#include <SDL.h>
+#include "SDL.h"
+
 #include "bitmask.h"
-#include "type.h"
-#include "timer.h"
-#include "screen/texture.h"
+#include "special/timer.h"
+#include "special/base.h"
+#include "video/surface.h"
 #include "collision.h"
-#include "sound.h"
-#include "moving_object.h"
-#include "physic.h"
+#include "special/moving_object.h"
+#include "math/physic.h"
+#include "defines.h"
+
+using namespace SuperTux;
+
+class BadGuy;
 
 /* Times: */
 
 #define TUX_SAFE_TIME 1250
 #define TUX_INVINCIBLE_TIME 10000
 #define TUX_INVINCIBLE_TIME_WARNING 2000
+#define TUX_FLAPPING_TIME 1000 /* How long Tux can flap his wings to gain additional jump height */
 #define TIME_WARNING 20000     /* When to alert player they're low on time! */
 
 /* One-ups... */
@@ -44,7 +50,12 @@
 /* Scores: */
 
 #define SCORE_BRICK 5
-#define SCORE_DISTRO 25
+#define SCORE_DISTRO 20
+
+/* Sizes: */
+
+#define SMALL 0
+#define BIG 1
 
 #include <vector>
 
@@ -52,11 +63,11 @@ struct PlayerKeymap
 {
 public:
   int jump;
-  int activate;
-  int duck;
+  int up;
+  int down;
   int left;
   int right;
-  int fire;
+  int power;
   
   PlayerKeymap();
 };
@@ -68,52 +79,53 @@ struct player_input_type
   int right;
   int left;
   int up;
-  int old_up;
   int down;
   int fire;
   int old_fire;
   int activate;
+  int jump;
+  int old_jump;
 };
 
 void player_input_init(player_input_type* pplayer_input);
 
+namespace SuperTux {
 class Sprite;
+}
 class Camera;
 
 extern Surface* tux_life;
 
 extern Sprite* smalltux_gameover;
 extern Sprite* smalltux_star;
-extern Sprite* largetux_star;
+extern Sprite* bigtux_star;
 
 #define GROWING_TIME 1000
 #define GROWING_FRAMES 7
 extern Surface* growingtux_left[GROWING_FRAMES];
 extern Surface* growingtux_right[GROWING_FRAMES];
 
-struct PlayerSprite
+class TuxBodyParts
 {
-  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;
-  Sprite* stomp;
+public:
+  TuxBodyParts() { };
+  ~TuxBodyParts() { };
+
+  void set_action(std::string action);
+  void one_time_animation();
+  void draw(DrawingContext& context, const Vector& pos, int layer,
+                Uint32 drawing_effect = NONE_EFFECT);
+
+  Sprite* head;
+  Sprite* body;
+  Sprite* arms;
+  Sprite* feet;
 };
 
-extern PlayerSprite smalltux;
-extern PlayerSprite largetux;
-extern PlayerSprite firetux;
-extern PlayerSprite icetux;
+extern TuxBodyParts* small_tux;
+extern TuxBodyParts* big_tux;
+extern TuxBodyParts* fire_tux;
+extern TuxBodyParts* ice_tux;
 
 class Player : public MovingObject
 {
@@ -137,10 +149,23 @@ public:
   FallMode fall_mode;
 
   bool jumping;
+  bool flapping;
   bool can_jump;
+  bool can_flap;
+  bool falling_from_flap;
+  bool enable_hover;
   bool butt_jump;
   int frame_;
   int frame_main;
+  
+  float flapping_velocity;
+
+  // Ricardo's flapping
+  int flaps_nb;
+
+  // temporary to help player's choosing a flapping
+  enum { MAREK_FLAP, RICARDO_FLAP, RYAN_FLAP, NONE_FLAP };
+  int flapping_mode;
 
   base_type  previous_base;
   Timer invincible_timer;
@@ -151,9 +176,10 @@ public:
   Timer shooting_timer;   // used to show the arm when Tux is shooting
   Timer dying_timer;
   Timer growing_timer;
-  Timer stomp_timer;
+  Timer idle_timer;
+  Timer flapping_timer;
   Physic physic;
-
+  
 public:
   Player();
   virtual ~Player();
@@ -177,6 +203,11 @@ public:
   bool tiles_on_air(int tiles);
   void grow(bool animate);
   void move(const Vector& vector);
+
+  /** let the player jump a bit or more if jump button is hold down
+      (used when you hit a badguy) */
+  void bounce(BadGuy* badguy);
+
   bool is_dead() const
   { return dead; }