...and welcome back again! :)

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 2d06465..719611b 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -23,13 +23,15 @@
 #include "SDL.h"
 
 #include "bitmask.h"
-#include "type.h"
-#include "timer.h"
-#include "screen/surface.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;
 
@@ -49,6 +51,11 @@ class BadGuy;
 #define SCORE_BRICK 5
 #define SCORE_DISTRO 25
 
+/* Sizes: */
+
+#define SMALL 0
+#define BIG 1
+
 #include <vector>
 
 struct PlayerKeymap
@@ -80,7 +87,9 @@ struct player_input_type
 
 void player_input_init(player_input_type* pplayer_input);
 
+namespace SuperTux {
 class Sprite;
+}
 class Camera;
 
 extern Surface* tux_life;
@@ -94,7 +103,7 @@ extern Sprite* largetux_star;
 extern Surface* growingtux_left[GROWING_FRAMES];
 extern Surface* growingtux_right[GROWING_FRAMES];
 
-struct PlayerSprite
+/*struct PlayerSprite
 {
   Sprite* stand_left;
   Sprite* stand_right;
@@ -110,13 +119,14 @@ struct PlayerSprite
   Sprite* grab_right;
   Sprite* duck_right;
   Sprite* duck_left;
-  Sprite* stomp;
-};
+};*/
+
+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
 {
@@ -154,11 +164,8 @@ public:
   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:
   Player();
   virtual ~Player();