- replaced YES/NO with true/false

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 1b3dc55..435f39c 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -20,6 +20,7 @@
 #include "texture.h"
 #include "collision.h"
 #include "sound.h"
+#include "physic.h"
 
 /* Times: */
 
@@ -27,6 +28,15 @@
 #define TUX_INVINCIBLE_TIME 10000
 #define TIME_WARNING 20000     /* When to alert player they're low on time! */
 
+/* One-ups... */
+
+#define DISTROS_LIFEUP 100
+
+/* Scores: */
+
+#define SCORE_BRICK 5
+#define SCORE_DISTRO 25
+
 typedef struct player_keymap_type
 {
  int jump;
@@ -48,28 +58,36 @@ typedef struct player_input_type
 }
 player_input_type;
 
+void player_input_init(player_input_type* pplayer_input);
+
 typedef struct player_type 
 {
- player_input_type input;
- player_keymap_type keymap;
- int got_coffee;
- int size;
- int duck;
- int dying;
- int dir;
- int jumping;
- int frame_main;
- int frame;
- int lives;
- base_type base;
- timer_type invincible_timer;
- timer_type jump_timer;
- timer_type skidding_timer;
- timer_type safe_timer;
+  player_input_type input;
+  player_keymap_type keymap;
+  int score;
+  int distros;
+  bool got_coffee;
+  int size;
+  bool duck;
+  DyingType dying;
+  int dir;
+  bool jumping;
+  int frame_main;
+  int frame;
+  int lives;
+  base_type base;
+  base_type old_base;
+  base_type previous_base;
+  timer_type invincible_timer;
+  timer_type skidding_timer;
+  timer_type safe_timer;
+  timer_type frame_timer;
+  physic_type vphysic;
+  physic_type hphysic;
 }
 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,
@@ -84,8 +102,7 @@ texture_type tux_life,
  bigcape_right[2],  bigcape_left[2];
 
 void player_init(player_type* pplayer);
-int player_keydown_event(player_type* pplayer, SDLKey key);
-int player_keyup_event(player_type* pplayer, SDLKey key);
+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);
@@ -96,5 +113,7 @@ void player_kill(player_type *pplayer, int mode);
 void player_dying(player_type *pplayer);
 void player_remove_powerups(player_type *pplayer);
 void player_keep_in_bounds(player_type *pplayer);
+bool player_on_ground(player_type *pplayer);
+bool player_under_solid(player_type *pplayer);
 
 #endif /*SUPERTUX_PLAYER_H*/