X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmenu.h;h=fa1ddf5b631165a733b7554eb0976bc5056eaa10;hb=69c5c5963e12883e1ecba6a64bdc8e6d94c854f3;hp=1ffefcbad6d6ff108d7d084c52e02b47c2a22efd;hpb=2c082bbb4a425558bde13145246431d0a62039d5;p=supertux.git

diff --git a/src/menu.h b/src/menu.h
index 1ffefcbad..fa1ddf5b6 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -53,7 +53,6 @@ enum GameMenuIDs {
 
 enum WorldMapMenuIDs {
   MNID_RETURNWORLDMAP,
-  MNID_SAVEGAME,
   MNID_QUITWORLDMAP
   };
 
@@ -81,6 +80,7 @@ enum LevelEditorSettingsMenuIDs {
   MNID_BGIMG,
   MNID_PARTICLE,
   MNID_LENGTH,
+  MNID_HEIGHT,
   MNID_TIME,
   MNID_GRAVITY,
   MNID_BGSPEED,
@@ -93,7 +93,7 @@ enum LevelEditorSettingsMenuIDs {
   MNID_APPLY
   };
 
-bool confirm_dialog(char *text);
+bool confirm_dialog(std::string text);
 
 /* Kinds of menu items */
 enum MenuItemKind {
@@ -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 */
@@ -209,6 +210,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);