projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- beginnings of a wingling
[supertux.git]
/
src
/
menu.h
diff --git
a/src/menu.h
b/src/menu.h
index
74a8669
..
4ac921d
100644
(file)
--- a/
src/menu.h
+++ b/
src/menu.h
@@
-53,7
+53,6
@@
enum GameMenuIDs {
enum WorldMapMenuIDs {
MNID_RETURNWORLDMAP,
enum WorldMapMenuIDs {
MNID_RETURNWORLDMAP,
- MNID_SAVEGAME,
MNID_QUITWORLDMAP
};
MNID_QUITWORLDMAP
};
@@
-62,12
+61,39
@@
enum LevelEditorMainMenuIDs {
MNID_SUBSETSETTINGS,
MNID_QUITLEVELEDITOR
};
MNID_SUBSETSETTINGS,
MNID_QUITLEVELEDITOR
};
+
+enum LevelEditorSubsetSettingsIDs {
+ MNID_SUBSETTITLE,
+ MNID_SUBSETDESCRIPTION,
+ MNID_SUBSETSAVECHANGES
+ };
+
+enum LevelEditorSubsetNewIDs {
+ MNID_SUBSETNAME,
+ MNID_CREATESUBSET
+};
enum LevelEditorSettingsMenuIDs {
enum LevelEditorSettingsMenuIDs {
+ MNID_NAME,
+ MNID_AUTHOR,
+ MNID_SONG,
+ MNID_BGIMG,
+ MNID_PARTICLE,
+ MNID_LENGTH,
+ MNID_HEIGHT,
+ MNID_TIME,
+ MNID_GRAVITY,
+ MNID_BGSPEED,
+ MNID_TopRed,
+ MNID_TopGreen,
+ MNID_TopBlue,
+ MNID_BottomRed,
+ MNID_BottomGreen,
+ MNID_BottomBlue,
MNID_APPLY
};
MNID_APPLY
};
-bool confirm_dialog(
char *
text);
+bool confirm_dialog(
std::string
text);
/* Kinds of menu items */
enum MenuItemKind {
/* Kinds of menu items */
enum MenuItemKind {
@@
-78,7
+104,8
@@
enum MenuItemKind {
MN_DEACTIVE,
MN_TEXTFIELD,
MN_NUMFIELD,
MN_DEACTIVE,
MN_TEXTFIELD,
MN_NUMFIELD,
- MN_CONTROLFIELD,
+ MN_CONTROLFIELD_KB,
+ MN_CONTROLFIELD_JS,
MN_STRINGSELECT,
MN_LABEL,
MN_HL, /* horizontal line */
MN_STRINGSELECT,
MN_LABEL,
MN_HL, /* horizontal line */
@@
-152,6
+179,7
@@
private:
/* input implementation variables */
int delete_character;
char mn_input_char;
/* input implementation variables */
int delete_character;
char mn_input_char;
+ Timer joystick_timer;
public:
Timer effect;
public:
Timer effect;
@@
-183,6
+211,7
@@
public:
bool isToggled(int id);
void Menu::get_controlfield_key_into_input(MenuItem *item);
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);
void draw ();
void draw_item(int index, int menu_width, int menu_height);