Allow skip/cancel gamepad button mapping using menu button.

This commit is contained in:
sorgelig
2019-10-23 15:50:14 +08:00
parent 6fee050765
commit e98b870421
3 changed files with 61 additions and 14 deletions

View File

@@ -2129,9 +2129,18 @@ void HandleUI(void)
menustate = MENU_JOYDIGMAP1;
parentstate = MENU_JOYDIGMAP;
for (int i = 0; i < OsdGetSize(); i++) OsdWrite(i);
OsdWrite(7, " Esc \x16 Cancel");
OsdWrite(8, " Enter \x16 Finish");
OsdWrite(9, " Space \x16 Skip");
if (is_menu_core())
{
OsdWrite(7, " Space \x16 Skip");
OsdWrite(8, " Esc \x16 Cancel");
OsdWrite(9, " Enter \x16 Finish");
}
else
{
OsdWrite(7, " Space/Menu \x16 Skip");
OsdWrite(8, " Menu-hold \x16 Cancel");
OsdWrite(9, " Enter \x16 Finish");
}
break;
case MENU_JOYDIGMAP1:
@@ -2146,6 +2155,14 @@ void HandleUI(void)
break;
}
if (get_map_cancel())
{
OsdWrite(3);
OsdWrite(4, " Canceling");
OsdWrite(5);
break;
}
const char* p = 0;
if (get_map_button() < 0)
{
@@ -2221,7 +2238,7 @@ void HandleUI(void)
if (!get_map_type()) OsdWrite(9);
}
OsdWrite(5, s);
if (!is_menu_core()) OsdWrite(10, " Menu/F12 \x16 Clear all");
if (!is_menu_core()) OsdWrite(10, " F12 \x16 Clear all");
}
}