Signed-off-by: Tim Schumacher <timschumi(a)gmx.de>
---
dlls/dinput/joystick_linuxinput.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 8d80b34812..fdfbc7f372 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -502,14 +502,18 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl
*dinput, unsig
/* Count number of available axes - supported Axis & POVs */
for (i = 0; i < ABS_MAX; i++)
{
- if (i < WINE_JOYSTICK_MAX_AXES &&
+ if (idx < WINE_JOYSTICK_MAX_AXES &&
+ i < ABS_HAT0X &&
test_bit(newDevice->joydev->absbits, i))
{
newDevice->generic.device_axis_count++;
newDevice->dev_axes_to_di[i] = idx;
newDevice->generic.props[idx].lDevMin =
newDevice->joydev->axes[i].minimum;
newDevice->generic.props[idx].lDevMax =
newDevice->joydev->axes[i].maximum;
- default_axis_map[idx] = i;
+ if (i >= 8 && i <= 10) /* If it's a wheel axis... */
+ default_axis_map[idx] = i - 8; /* ... remap to X/Y/Z */
+ else
+ default_axis_map[idx] = i;
idx++;
}
else
--
2.21.0
Show replies by date