- beginnings of a wingling

[supertux.git] / src / menu.h

diff --git a/src/menu.h b/src/menu.h
index 641b68d..4ac921d 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -80,6 +80,7 @@ enum LevelEditorSettingsMenuIDs {
   MNID_BGIMG,
   MNID_PARTICLE,
   MNID_LENGTH,
+  MNID_HEIGHT,
   MNID_TIME,
   MNID_GRAVITY,
   MNID_BGSPEED,
@@ -92,7 +93,7 @@ enum LevelEditorSettingsMenuIDs {
   MNID_APPLY
   };
 
-bool confirm_dialog(char *text);
+bool confirm_dialog(std::string text);
 
 /* Kinds of menu items */
 enum MenuItemKind {
@@ -103,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 */
@@ -177,6 +179,7 @@ private:
   /* input implementation variables */
   int delete_character;
   char mn_input_char;
+  Timer joystick_timer;
   
 public:
   Timer effect;
@@ -208,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);