confirm_dialog now accepts a background, instead of doing the screen capture hack.

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index b3496eb..78c22d9 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -52,6 +52,7 @@ struct PlayerKeymap
 {
 public:
   int jump;
+  int activate;
   int duck;
   int left;
   int right;
@@ -71,11 +72,13 @@ struct player_input_type
   int down;
   int fire;
   int old_fire;
+  int activate;
 };
 
 void player_input_init(player_input_type* pplayer_input);
 
 class Sprite;
+class Camera;
 
 extern Surface* tux_life;
 
@@ -163,7 +166,7 @@ public:
   void collision(void* p_c_object, int c_object);
   void kill(HurtMode mode);
   void player_remove_powerups();
-  void check_bounds(DrawingContext& context);
+  void check_bounds(Camera* camera);
   bool on_ground();
   bool under_solid();
   bool tiles_on_air(int tiles);