# HG changeset patch # User Sam Lantinga # Date 1370566741 25200 # Node ID 341d22fe9044a15005daaee03c8b2be6d7df96ff # Parent fdf42e4cdcec1a9ad00a38d114404acdb3362eba The triggers should be expanded out to the full range to match DirectInput behavior. The game controller code will scale them back to 0 - 32767 when it converts the triggers axes. diff -r fdf42e4cdcec -r 341d22fe9044 src/joystick/windows/SDL_dxjoystick.c --- a/src/joystick/windows/SDL_dxjoystick.c Thu Jun 06 07:25:41 2013 -0700 +++ b/src/joystick/windows/SDL_dxjoystick.c Thu Jun 06 17:59:01 2013 -0700 @@ -1499,8 +1499,8 @@ SDL_PrivateJoystickAxis(joystick, 1, (Sint16)(-1*pXInputState->Gamepad.sThumbLY-1) ); SDL_PrivateJoystickAxis(joystick, 2, (Sint16)pXInputState->Gamepad.sThumbRX ); SDL_PrivateJoystickAxis(joystick, 3, (Sint16)(-1*pXInputState->Gamepad.sThumbRY-1) ); - SDL_PrivateJoystickAxis(joystick, 4, (Sint16)((int)pXInputState->Gamepad.bLeftTrigger*32767/255) ); - SDL_PrivateJoystickAxis(joystick, 5, (Sint16)((int)pXInputState->Gamepad.bRightTrigger*32767/255) ); + SDL_PrivateJoystickAxis(joystick, 4, (Sint16)(((int)pXInputState->Gamepad.bLeftTrigger*65535/255) - 32768)); + SDL_PrivateJoystickAxis(joystick, 5, (Sint16)(((int)pXInputState->Gamepad.bRightTrigger*65535/255) - 32768)); if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_UP ) ) SDL_PrivateJoystickButton(joystick, 0, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP ? SDL_PRESSED : SDL_RELEASED );