projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Added a joystick control dialog.
[supertux.git]
/
src
/
menu.cpp
diff --git
a/src/menu.cpp
b/src/menu.cpp
index
798dce3
..
db41fce
100644
(file)
--- a/
src/menu.cpp
+++ b/
src/menu.cpp
@@
-48,7
+48,8
@@
Menu* main_menu = 0;
Menu* game_menu = 0;
Menu* worldmap_menu = 0;
Menu* options_menu = 0;
-Menu* options_controls_menu = 0;
+Menu* options_keys_menu = 0;
+Menu* options_joystick_menu = 0;
Menu* highscore_menu = 0;
Menu* load_game_menu = 0;
Menu* save_game_menu = 0;