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

(dinput) Buildfix

Browse Source
This commit is contained in:
twinaphex 2019-07-04 14:02:24 +02:00
parent 650c0e7e0a
commit ff0ea2921f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
input/drivers/dinput.c
View File

@ -328,10 +328,19 @@ static bool dinput_is_pressed(struct dinput_input *di,
if (binds && binds[id].valid) if (binds && binds[id].valid)
{ {
if (dinput_mouse_button_pressed(di, port, bind->mbutton)) /* Auto-binds are per joypad, not per user. */
return true; const uint16_t joykey = (binds[id].joykey != NO_BTN)
if (input_joypad_pressed(di->joypad, joypad_info, port, binds, id)) ? binds[id].joykey : joypad_info.auto_binds[id].joykey;
return true; const uint32_t joyaxis = (binds[id].joyaxis != AXIS_NONE)
? binds[id].joyaxis : joypad_info.auto_binds[id].joyaxis;
if (dinput_mouse_button_pressed(di, port, binds[id].mbutton))
return true;
if (joykey != NO_BTN
&& di->joypad->button(joypad_info.joy_idx, joykey))
return true;
if (((float)abs(di->joypad->axis(joypad_info.joy_idx, joyaxis)) / 0x8000) > joypad_info.axis_threshold)
return true;
} }
return false; return false;