diff options
Diffstat (limited to 'src/emu/uimenu.c')
-rw-r--r-- | src/emu/uimenu.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index dbe449581ff..f3a36c86ca3 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -1502,7 +1502,7 @@ static void ui_menu_keyboard_mode(running_machine &machine, ui_menu *menu, void /*------------------------------------------------- - ui_slot_get_current_index - returns + ui_slot_get_current_index - returns -------------------------------------------------*/ int ui_slot_get_current_index(running_machine &machine, device_slot_interface *slot) { @@ -1516,7 +1516,7 @@ int ui_slot_get_current_index(running_machine &machine, device_slot_interface *s } /*------------------------------------------------- - ui_slot_get_length - returns + ui_slot_get_length - returns -------------------------------------------------*/ int ui_slot_get_length(running_machine &machine, device_slot_interface *slot) { @@ -1527,7 +1527,7 @@ int ui_slot_get_length(running_machine &machine, device_slot_interface *slot) } /*------------------------------------------------- - ui_slot_get_next - returns + ui_slot_get_next - returns -------------------------------------------------*/ const char *ui_slot_get_next(running_machine &machine, device_slot_interface *slot) { @@ -1537,18 +1537,18 @@ const char *ui_slot_get_next(running_machine &machine, device_slot_interface *sl } /*------------------------------------------------- - ui_slot_get_prev - returns + ui_slot_get_prev - returns -------------------------------------------------*/ const char *ui_slot_get_prev(running_machine &machine, device_slot_interface *slot) { int idx = ui_slot_get_current_index(machine, slot) - 1; if (idx==-1) return ""; - if (idx==-2) idx = ui_slot_get_length(machine,slot) -1; + if (idx==-2) idx = ui_slot_get_length(machine,slot) -1; return slot->get_slot_interfaces()[idx].name; } /*------------------------------------------------- - ui_get_slot_device - returns + ui_get_slot_device - returns -------------------------------------------------*/ const char *ui_get_slot_device(running_machine &machine, device_slot_interface *slot) { @@ -1562,12 +1562,12 @@ const char *ui_get_slot_device(running_machine &machine, device_slot_interface * -------------------------------------------------*/ void ui_set_slot_device(running_machine &machine, device_slot_interface *slot, const char *val) -{ +{ astring error; machine.options().set_value(slot->device().tag(), val, OPTION_PRIORITY_CMDLINE, error); assert(!error); } - + /*------------------------------------------------- menu_slot_devices_populate - populates the main slot device menu @@ -1576,7 +1576,7 @@ void ui_set_slot_device(running_machine &machine, device_slot_interface *slot, c static void menu_slot_devices_populate(running_machine &machine, ui_menu *menu, void *state) { device_slot_interface *slot = NULL; - + /* cycle through all devices for this system */ for (bool gotone = machine.devicelist().first(slot); gotone; gotone = slot->next(slot)) { @@ -1585,7 +1585,7 @@ static void menu_slot_devices_populate(running_machine &machine, ui_menu *menu, ui_menu_item_append(menu, slot->device().tag(), strcmp(title,"")==0 ? "------" : title, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)slot); } ui_menu_item_append(menu, MENU_SEPARATOR_ITEM, NULL, 0, NULL); - ui_menu_item_append(menu, "Reset", NULL, 0, NULL); + ui_menu_item_append(menu, "Reset", NULL, 0, NULL); } /*------------------------------------------------- @@ -1599,7 +1599,7 @@ static void ui_menu_slot_devices(running_machine &machine, ui_menu *menu, void * /* if the menu isn't built, populate now */ if (!ui_menu_populated(menu)) { - menu_slot_devices_populate(machine, menu, state); + menu_slot_devices_populate(machine, menu, state); } /* process the menu */ @@ -1607,11 +1607,11 @@ static void ui_menu_slot_devices(running_machine &machine, ui_menu *menu, void * if (menu_event != NULL && menu_event->itemref != NULL) { - if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT) { - device_slot_interface *slot = (device_slot_interface *)menu_event->itemref; + if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT) { + device_slot_interface *slot = (device_slot_interface *)menu_event->itemref; const char *val = (menu_event->iptkey == IPT_UI_LEFT) ? ui_slot_get_prev(machine,slot) : ui_slot_get_next(machine,slot); - ui_set_slot_device(machine,slot,val); - ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_REF); + ui_set_slot_device(machine,slot,val); + ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_REF); } } else if (menu_event != NULL && menu_event->iptkey == IPT_UI_SELECT) { machine.schedule_hard_reset(); @@ -1683,14 +1683,14 @@ static void menu_main_populate(running_machine &machine, ui_menu *menu, void *st if (machine.devicelist().first(BITBANGER)) ui_menu_item_append(menu, "Bitbanger Control", NULL, 0, (void*)ui_mess_menu_bitbanger_control); } - + device_slot_interface *slot = NULL; if (machine.devicelist().first(slot)) { /* add image info menu */ ui_menu_item_append(menu, "Slot Devices", NULL, 0, (void*)ui_menu_slot_devices); } - + /* add keyboard mode menu */ if (input_machine_has_keyboard(machine) && inputx_can_post(machine)) ui_menu_item_append(menu, "Keyboard Mode", NULL, 0, (void *)ui_menu_keyboard_mode); |