X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.h;h=91e14b5117f273ea58f0f5eaa9d33dc47addb67d;hb=9599042661b468aae7bd34dca05441c0ebc93ad7;hp=0a179a425dedb4b653d389e8e27d6ff8d55515b7;hpb=7a87271678d68514ae2158c0c7adb383d6002872;p=supertux.git

diff --git a/src/object/player.h b/src/object/player.h
index 0a179a425..91e14b511 100644
--- a/src/object/player.h
+++ b/src/object/player.h
@@ -20,14 +20,14 @@
 #define SUPERTUX_PLAYER_H
 
 #include <vector>
-#include "SDL.h"
+#include <SDL.h>
 
 #include "timer.h"
+#include "direction.h"
 #include "video/surface.h"
 #include "special/moving_object.h"
 #include "special/sprite.h"
 #include "math/physic.h"
-#include "defines.h"
 
 using namespace SuperTux;
 
@@ -61,28 +61,33 @@ public:
 
 extern PlayerKeymap keymap;
 
-struct player_input_type
+/** Contains a field of booleans that indicate wheter a button is pressed or
+ * released. The old_ fields contain the state of the button at the previous
+ * frame.
+ */
+struct PlayerInputType
 {
-  int right;
-  int left;
-  int up;
-  int old_up;
-  int down;
-  int fire;
-  int old_fire;
-  int activate;
-  int jump;
-  int old_jump;
+public:
+  PlayerInputType();
+  void reset();
+
+  bool left;
+  bool right;
+  bool up;
+  bool old_up;
+  bool down;
+  bool fire;
+  bool old_fire;
+  bool activate;
+  bool jump;
+  bool old_jump;
 };
 
-void player_input_init(player_input_type* pplayer_input);
-
 class Camera;
 class PlayerStatus;
 
 extern Surface* tux_life;
 
-
 #define GROWING_TIME 1.0
 #define GROWING_FRAMES 7
 extern Surface* growingtux_left[GROWING_FRAMES];
@@ -124,12 +129,15 @@ public:
   enum Power { NONE_POWER, FIRE_POWER, ICE_POWER };
   enum FallMode { ON_GROUND, JUMPING, TRAMPOLINE_JUMP, FALLING };
 
-  player_input_type  input;
+  PlayerInputType input;
   int got_power;
   int size;
   bool duck;
   bool dead;
-  DyingType dying;
+
+private:
+  bool dying;
+public:
 
   Direction dir;
   Direction old_dir;
@@ -170,7 +178,7 @@ public:
   Player();
   virtual ~Player();
   
-  int  key_event(SDLKey key, int state);
+  bool key_event(SDLKey key, bool state);
   void level_begin();
   void handle_input();
 
@@ -183,7 +191,11 @@ public:
   void make_invincible();
   bool is_invincible() const
   {
-      return invincible_timer.started();
+    return invincible_timer.started();
+  }
+  bool is_dying() const
+  {
+    return dying;
   }
   
   void kill(HurtMode mode);