diff options
author | 2022-06-14 16:33:21 +1000 | |
---|---|---|
committer | 2022-06-14 16:33:21 +1000 | |
commit | 1f26ec6836364ef523aa4e375c63186bd8fe323f (patch) | |
tree | 883f691395a7fbe71865a624844942d28124d7a8 /src/frontend/mame/ui/inputopts.cpp | |
parent | 4a4b718bc9d32b4cd55a90762c960165be2f6043 (diff) | |
parent | 6741eca4d61627072710dc86f458f34a3acf7c5c (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# scripts/build/verinfo.py
# scripts/resources/windows/mame/mame.rc
# scripts/src/main.lua
# src/mame/drivers/8080bw.cpp
Diffstat (limited to 'src/frontend/mame/ui/inputopts.cpp')
-rw-r--r-- | src/frontend/mame/ui/inputopts.cpp | 9 |
1 files changed, 5 insertions, 4 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); } |