(uwp_input.c) Refactor code

This commit is contained in:
twinaphex 2020-07-20 23:22:07 +02:00
parent caa1145b35
commit 41b9b8d650

View File

@ -151,19 +151,7 @@ static int16_t uwp_input_state(void *data,
int16_t ret = uwp->joypad->state(
joypad_info, binds[port], port);
if (input_uwp.keyboard_mapping_blocked)
{
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{
if (binds[port][i].valid)
{
if (uwp_mouse_state(port,
binds[port][i].mbutton, false))
ret |= (1 << i);
}
}
}
else
if (!input_uwp.keyboard_mapping_blocked)
{
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{
@ -174,13 +162,20 @@ static int16_t uwp_input_state(void *data,
&& uwp_keyboard_pressed(binds[port][i].key))
)
ret |= (1 << i);
else if (uwp_mouse_state(port,
binds[port][i].mbutton, false))
ret |= (1 << i);
}
}
}
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{
if (binds[port][i].valid)
{
if (uwp_mouse_state(port,
binds[port][i].mbutton, false))
ret |= (1 << i);
}
}
return ret;
}
else