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

Merge pull request #2429 from mak77/fix-dinput-sliders

Browse Source 
Poll sliders in joypad dinput driver
This commit is contained in:
Twinaphex 2015-11-19 03:16:38 +01:00
commit fcfb14f200
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/drivers_joypad/dinput_joypad.c
View File

@ -179,7 +179,7 @@ static const char *dinput_joypad_name(unsigned pad)
static int32_t dinput_joypad_vid(unsigned pad)
{
return g_pads[pad].vid;
return g_pads[pad].vid;
}
static int32_t dinput_joypad_pid(unsigned pad)
@ -377,12 +377,12 @@ static int16_t dinput_joypad_axis(unsigned port_num, uint32_t joyaxis)
if (!pad->joypad)
return 0;
if (AXIS_NEG_GET(joyaxis) <= 5)
if (AXIS_NEG_GET(joyaxis) <= 7)
{
axis = AXIS_NEG_GET(joyaxis);
is_neg = true;
}
else if (AXIS_POS_GET(joyaxis) <= 5)
else if (AXIS_POS_GET(joyaxis) <= 7)
{
axis = AXIS_POS_GET(joyaxis);
is_pos = true;
@ -408,6 +408,12 @@ static int16_t dinput_joypad_axis(unsigned port_num, uint32_t joyaxis)
case 5:
val = pad->joy_state.lRz;
break;
case 6:
val = pad->joy_state.rglSlider[0];
break;
case 7:
val = pad->joy_state.rglSlider[1];
break;
}
if (is_neg && val > 0)