Corrected collition with bag of money

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index c3f05e6..0f4528a 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -16,14 +16,27 @@
 #include <SDL.h>
 #include "bitmask.h"
 #include "type.h"
+#include "timer.h"
+#include "texture.h"
 #include "collision.h"
+#include "sound.h"
 
 /* Times: */
 
-#define TUX_SAFE_TIME 16
+#define TUX_SAFE_TIME 750
 #define TUX_INVINCIBLE_TIME 10000
 #define TIME_WARNING 20000     /* When to alert player they're low on time! */
 
+typedef struct player_keymap_type
+{
+ int jump;
+ int duck;
+ int left;
+ int right;
+ int fire;
+}
+player_keymap_type;
+
 typedef struct player_input_type
 {
  int right;
@@ -38,10 +51,9 @@ player_input_type;
 typedef struct player_type 
 {
  player_input_type input;
+ player_keymap_type keymap;
  int got_coffee;
  int size;
- int skidding;
- int safe;
  int duck;
  int dying;
  int dir;
@@ -49,20 +61,15 @@ typedef struct player_type
  int frame_main;
  int frame;
  int lives;
- float x;
- float y;
- float xm;
- float ym;
- float width;
- float height;
+ base_type base;
  timer_type invincible_timer;
  timer_type jump_timer;
- unsigned int updated;
- itop_type it;
+ timer_type skidding_timer;
+ timer_type safe_timer;
 }
 player_type;
 
-texture_type tux_life,
+extern texture_type tux_life,
  tux_right[3],  tux_left[3],
  bigtux_right[3],  bigtux_left[3],
  bigtux_right_jump,  bigtux_left_jump,
@@ -77,6 +84,7 @@ texture_type tux_life,
  bigcape_right[2],  bigcape_left[2];
 
 void player_init(player_type* pplayer);
+int player_key_event(player_type* pplayer, SDLKey key, int state);
 void player_level_begin(player_type* pplayer);
 void player_action(player_type* pplayer);
 void player_input(player_type* pplayer);