X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmenu.h;h=4ac921dd8c87e2e7f2142a3a3f97f837614a8373;hb=157cef71aeb9ae25b7bb90f37dda11bc09329d11;hp=41d6dd7d733abd4c0305c7e041fb01268437b8a2;hpb=af2df0666bcd2217a02ed3fbb55399f2163ab4d9;p=supertux.git

diff --git a/src/menu.h b/src/menu.h
index 41d6dd7d7..4ac921dd8 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -104,7 +104,8 @@ enum MenuItemKind {
   MN_DEACTIVE,
   MN_TEXTFIELD,
   MN_NUMFIELD,
-  MN_CONTROLFIELD,
+  MN_CONTROLFIELD_KB,
+  MN_CONTROLFIELD_JS,
   MN_STRINGSELECT,
   MN_LABEL,
   MN_HL, /* horizontal line */
@@ -178,6 +179,7 @@ private:
   /* input implementation variables */
   int delete_character;
   char mn_input_char;
+  Timer joystick_timer;
   
 public:
   Timer effect;
@@ -209,6 +211,7 @@ public:
   bool isToggled(int id);
 
   void Menu::get_controlfield_key_into_input(MenuItem *item);
+  void Menu::get_controlfield_js_into_input(MenuItem *item);
 
   void draw   ();
   void draw_item(int index, int menu_width, int menu_height);