Sometime ago I asked what keys ppl would prefer, made the changes now to reflect...

[supertux.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index f995219..b76022b 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -63,11 +63,11 @@ struct PlayerKeymap
 {
 public:
   int jump;
-  int activate;
-  int duck;
+  int up;
+  int down;
   int left;
   int right;
-  int fire;
+  int power;
   
   PlayerKeymap();
 };
@@ -79,11 +79,12 @@ struct player_input_type
   int right;
   int left;
   int up;
-  int old_up;
   int down;
   int fire;
   int old_fire;
   int activate;
+  int jump;
+  int old_jump;
 };
 
 void player_input_init(player_input_type* pplayer_input);
@@ -151,6 +152,7 @@ public:
   bool flapping;
   bool can_jump;
   bool can_flap;
+  bool falling_from_flap;
   bool enable_hover;
   bool butt_jump;
   int frame_;