diff options
Diffstat (limited to 'src/frontend/mame/ui')
-rw-r--r-- | src/frontend/mame/ui/inputopts.cpp | 9 | ||||
-rw-r--r-- | src/frontend/mame/ui/miscmenu.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/frontend/mame/ui/inputopts.cpp b/src/frontend/mame/ui/inputopts.cpp index 6884574c6a5..ff433e72e7e 100644 --- a/src/frontend/mame/ui/inputopts.cpp +++ b/src/frontend/mame/ui/inputopts.cpp @@ -92,7 +92,7 @@ void menu_input_options::populate(float &customtop, float &custombottom) bool inputmap, analog, toggle; scan_inputs(machine(), inputmap, analog, toggle); - item_append(_("menu-inputopts", "Input Assignments (general)"), 0, (void *)INPUTMAP_GENERAL); + // system-specific stuff if (inputmap) item_append(_("menu-inputopts", "Input Assignments (this system)"), 0, (void *)INPUTMAP_MACHINE); if (analog) @@ -101,11 +101,12 @@ void menu_input_options::populate(float &customtop, float &custombottom) item_append(_("menu-inputopts", "Keyboard Selection"), 0, (void *)KEYBOARD); if (toggle) item_append(_("menu-inputopts", "Toggle Inputs"), 0, (void *)TOGGLES); + if (inputmap || analog || machine().natkeyboard().keyboard_count() || toggle) + item_append(menu_item_type::SEPARATOR); - item_append(menu_item_type::SEPARATOR); - + // general stuff + item_append(_("menu-inputopts", "Input Assignments (general)"), 0, (void *)INPUTMAP_GENERAL); item_append(_("menu-inputopts", "Input Devices"), 0, (void *)INPUTDEV); - item_append(menu_item_type::SEPARATOR); } diff --git a/src/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp index 58792ef56c8..55a2aab986f 100644 --- a/src/frontend/mame/ui/miscmenu.cpp +++ b/src/frontend/mame/ui/miscmenu.cpp @@ -453,8 +453,8 @@ void menu_crosshair::populate(float &customtop, float &custombottom) // Make sure to keep these matched to the CROSSHAIR_VISIBILITY_xxx types static char const *const vis_text[] = { - N_p("menu-crosshair", "Always"), N_p("menu-crosshair", "Never"), + N_p("menu-crosshair", "Always"), N_p("menu-crosshair", "When moved") }; bool use_auto = false; |