diff options
Diffstat (limited to 'src/emu/ui/optsmenu.cpp')
-rw-r--r-- | src/emu/ui/optsmenu.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/emu/ui/optsmenu.cpp b/src/emu/ui/optsmenu.cpp index 05232636d2e..796bd665512 100644 --- a/src/emu/ui/optsmenu.cpp +++ b/src/emu/ui/optsmenu.cpp @@ -17,8 +17,6 @@ #include "ui/selector.h" #include "ui/custui.h" #include "ui/sndmenu.h" -#include "ui/ctrlmenu.h" -#include "ui/dsplmenu.h" #include "ui/miscmenu.h" #include "ui/optsmenu.h" #include "ui/custmenu.h" @@ -171,7 +169,7 @@ void ui_menu_game_options::handle() break; case DISPLAY_MENU: if (m_event->iptkey == IPT_UI_SELECT) - ui_menu::stack_push(global_alloc_clear<ui_menu_display_options>(machine(), container)); + ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, video_submenu_options)); break; case CUSTOM_MENU: if (m_event->iptkey == IPT_UI_SELECT) @@ -179,7 +177,7 @@ void ui_menu_game_options::handle() break; case CONTROLLER_MENU: if (m_event->iptkey == IPT_UI_SELECT) - ui_menu::stack_push(global_alloc_clear<ui_menu_controller_mapping>(machine(), container)); + ui_menu::stack_push(global_alloc_clear<ui_submenu>(machine(), container, control_submenu_options)); break; case CGI_MENU: if (m_event->iptkey == IPT_UI_SELECT) @@ -263,12 +261,12 @@ void ui_menu_game_options::populate() item_append(_("Customize UI"), nullptr, 0, (void *)(FPTR)CUSTOM_MENU); item_append(_("Configure Directories"), nullptr, 0, (void *)(FPTR)CONF_DIR); } - item_append(_("Display Options"), nullptr, 0, (void *)(FPTR)DISPLAY_MENU); + item_append(_(video_submenu_options[0].description), nullptr, 0, (void *)(FPTR)DISPLAY_MENU); item_append(_("Sound Options"), nullptr, 0, (void *)(FPTR)SOUND_MENU); - item_append(_(misc_submenu_options[0].description), nullptr, 0, (void *)(FPTR)MISC_MENU); - item_append(_("Device Mapping"), nullptr, 0, (void *)(FPTR)CONTROLLER_MENU); + item_append(_(misc_submenu_options[0].description), nullptr, 0, (void *)(FPTR)MISC_MENU); + item_append(_(control_submenu_options[0].description), nullptr, 0, (void *)(FPTR)CONTROLLER_MENU); item_append(_("General Inputs"), nullptr, 0, (void *)(FPTR)CGI_MENU); - item_append(_(advanced_submenu_options[0].description), nullptr, 0, (void *)(FPTR)ADVANCED_MENU); + item_append(_(advanced_submenu_options[0].description), nullptr, 0, (void *)(FPTR)ADVANCED_MENU); item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); item_append(_("Save Configuration"), nullptr, 0, (void *)(FPTR)SAVE_CONFIG); |