Further cleanups and corrections

This commit is contained in:
twinaphex 2020-06-11 17:18:28 +02:00
parent 6ddbf911e3
commit 3eaf7d5e66
2 changed files with 5 additions and 11 deletions

View File

@ -604,18 +604,12 @@ static int16_t dinput_input_state(void *data,
{ {
if ((binds[port][i].key < RETROK_LAST) && if ((binds[port][i].key < RETROK_LAST) &&
di->state[rarch_keysym_lut[(enum retro_key)binds[port][i].key]] & 0x80) di->state[rarch_keysym_lut[(enum retro_key)binds[port][i].key]] & 0x80)
{
ret |= (1 << i); ret |= (1 << i);
continue; else if (binds[port][i].valid)
}
if (binds[port][i].valid)
if (dinput_is_pressed( if (dinput_is_pressed(
di, settings, joypad_info, binds[port], port, i)) di, settings, joypad_info,
{ binds[port], port, i))
ret |= (1 << i); ret |= (1 << i);
continue;
}
} }
} }
return ret; return ret;

View File

@ -669,8 +669,8 @@ static int16_t winraw_input_state(void *d,
{ {
if ((binds[port][i].key < RETROK_LAST) && if ((binds[port][i].key < RETROK_LAST) &&
winraw_keyboard_pressed(wr, binds[port][i].key)) winraw_keyboard_pressed(wr, binds[port][i].key))
return true; ret |= (1 << i);
if (binds[port][i].valid) else if (binds[port][i].valid)
if (winraw_is_pressed( if (winraw_is_pressed(
wr, mouse, joypad_info, binds[port], port, i)) wr, mouse, joypad_info, binds[port], port, i))
ret |= (1 << i); ret |= (1 << i);