some cleanups in the sprite class, increased delta for collision response

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index dbf43bb..ada9e96 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -16,35 +16,40 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SUPERTUX_PLAYER_H
 #define SUPERTUX_PLAYER_H
 
-#include <SDL.h>
-#include "bitmask.h"
-#include "type.h"
+#include "SDL.h"
+
 #include "timer.h"
-#include "screen/texture.h"
+#include "video/surface.h"
 #include "collision.h"
-#include "sound.h"
-#include "moving_object.h"
-#include "physic.h"
+#include "special/moving_object.h"
+#include "special/sprite.h"
+#include "math/physic.h"
+#include "defines.h"
 
-/* Times: */
+using namespace SuperTux;
 
-#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! */
+class BadGuy;
 
-/* One-ups... */
+/* Times: */
 
-#define DISTROS_LIFEUP 100
+#define TUX_SAFE_TIME 1.250
+#define TUX_INVINCIBLE_TIME 10.0
+#define TUX_INVINCIBLE_TIME_WARNING 2.0
+#define TUX_FLAPPING_TIME 1 /* How long Tux can flap his wings to gain additional jump height */
+#define TIME_WARNING 20     /* When to alert player they're low on time! */
 
 /* Scores: */
 
 #define SCORE_BRICK 5
-#define SCORE_DISTRO 25
+#define SCORE_DISTRO 20
+
+/* Sizes: */
+
+#define SMALL 0
+#define BIG 1
 
 #include <vector>
 
@@ -52,11 +57,11 @@ struct PlayerKeymap
 {
 public:
   int jump;
-  int activate;
-  int duck;
+  int up;
+  int down;
   int left;
   int right;
-  int fire;
+  int power;
   
   PlayerKeymap();
 };
@@ -73,47 +78,54 @@ struct player_input_type
   int fire;
   int old_fire;
   int activate;
+  int jump;
+  int old_jump;
 };
 
 void player_input_init(player_input_type* pplayer_input);
 
-class Sprite;
 class Camera;
+class PlayerStatus;
 
 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_TIME 1.0
 #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()
+    : head(0), body(0), arms(0), feet(0)
+  { }
+  ~TuxBodyParts() {
+    delete head;
+    delete body;
+    delete arms;
+    delete feet;
+  }
+
+  void set_action(std::string action, int loops = -1);
+  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
 {
@@ -136,26 +148,35 @@ public:
   float last_ground_y;
   FallMode fall_mode;
 
+  bool on_ground_flag;
   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;
-
-  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;
+  
+  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;
+
+  Timer2 invincible_timer;
+  Timer2 skidding_timer;
+  Timer2 safe_timer;
+  Timer2 kick_timer;
+  Timer2 shooting_timer;   // used to show the arm when Tux is shooting
+  Timer2 dying_timer;
+  Timer2 growing_timer;
+  Timer2 idle_timer;
+  Timer2 flapping_timer;
   Physic physic;
   
-  Vector stomp_pos;
-
 public:
   Player();
   virtual ~Player();
@@ -165,20 +186,27 @@ public:
   void handle_input();
   void grabdistros();
 
+  PlayerStatus& get_status();
+
   virtual void action(float elapsed_time);
   virtual void draw(DrawingContext& context);
-  virtual void collision(const MovingObject& other_object,
-      int collision_type);
+  virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
-  void collision(void* p_c_object, int c_object);
+  void make_invincible();
+  bool is_invincible() const
+  {
+      return invincible_timer.started();
+  }
   void kill(HurtMode mode);
   void player_remove_powerups();
   void check_bounds(Camera* camera);
   bool on_ground();
   bool under_solid();
-  bool tiles_on_air(int tiles);
-  void grow(bool animate);
+  void grow(bool animate = false);
   void move(const Vector& vector);
+
+  void bounce(BadGuy& badguy);
+
   bool is_dead() const
   { return dead; }