mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further cleanups and corrections

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/drivers/dinput.c
View File

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

4
input/drivers/winraw_input.c
View File

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