...and welcome back again! :)

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 04473f2..719611b 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -20,16 +20,20 @@
 #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 "special/timer.h"
+#include "special/base.h"
+#include "video/surface.h"
 #include "collision.h"
-#include "sound.h"
-#include "moving_object.h"
-#include "drawable.h"
-#include "physic.h"
+#include "special/moving_object.h"
+#include "math/physic.h"
+#include "defines.h"
+
+using namespace SuperTux;
+
+class BadGuy;
 
 /* Times: */
 
@@ -47,12 +51,18 @@
 #define SCORE_BRICK 5
 #define SCORE_DISTRO 25
 
+/* Sizes: */
+
+#define SMALL 0
+#define BIG 1
+
 #include <vector>
 
 struct PlayerKeymap
 {
 public:
   int jump;
+  int activate;
   int duck;
   int left;
   int right;
@@ -72,11 +82,15 @@ struct player_input_type
   int down;
   int fire;
   int old_fire;
+  int activate;
 };
 
 void player_input_init(player_input_type* pplayer_input);
 
+namespace SuperTux {
 class Sprite;
+}
+class Camera;
 
 extern Surface* tux_life;
 
@@ -84,7 +98,12 @@ extern Sprite* smalltux_gameover;
 extern Sprite* smalltux_star;
 extern Sprite* largetux_star;
 
-struct PlayerSprite
+#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;
   Sprite* stand_right;
@@ -100,14 +119,16 @@ struct PlayerSprite
   Sprite* grab_right;
   Sprite* duck_right;
   Sprite* duck_left;
-};
+};*/
+
+extern Sprite* small_tux;
+extern Sprite* big_tux;
+extern Sprite* fire_tux;
+extern Sprite* ice_tux;
 
-extern PlayerSprite smalltux;
-extern PlayerSprite largetux;
-extern PlayerSprite firetux;
-extern PlayerSprite icetux;
+extern Sprite* tux_arm;
 
-class Player : public MovingObject, public Drawable
+class Player : public MovingObject
 {
 public:
   enum HurtMode { KILL, SHRINK };
@@ -119,6 +140,7 @@ public:
   int size;
   bool duck;
   bool holding_something;
+  bool dead;
   DyingType dying;
 
   Direction dir;
@@ -140,10 +162,12 @@ public:
   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:
-  Player(DisplayManager& display_manager);
+  Player();
   virtual ~Player();
   
   int  key_event(SDLKey key, int state);
@@ -152,20 +176,26 @@ public:
   void grabdistros();
 
   virtual void action(float elapsed_time);
-  virtual void draw(Camera& viewport, int layer);
+  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 check_bounds(Camera& viewport, bool back_scrolling, bool hor_autoscroll);
+  void check_bounds(Camera* camera);
   bool on_ground();
   bool under_solid();
   bool tiles_on_air(int tiles);
-  void grow();
+  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; }
   
 private:
   void init();