Просмотр исходного кода

haptic: Enable gamepad haptic support under sdl2-compat

(cherry picked from commit c677c913a634a9ecf1e131f089fb31415382b722)
Cameron Gutman 1 неделя назад
Родитель
Сommit
102bf22db8
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      src/haptic/SDL_haptic.c

+ 2 - 2
src/haptic/SDL_haptic.c

@@ -306,9 +306,9 @@ bool SDL_IsJoystickHaptic(SDL_Joystick *joystick)
 
     SDL_LockJoysticks();
     {
-        // Must be a valid joystick
+        // Must be a valid joystick, but not a gamepad unless running under sdl2-compat
         if (SDL_IsJoystickValid(joystick) &&
-            !SDL_IsGamepad(SDL_GetJoystickID(joystick))) {
+            (SDL_GetHintBoolean("SDL2_COMPAT", false) || !SDL_IsGamepad(SDL_GetJoystickID(joystick)))) {
             #ifdef SDL_JOYSTICK_HIDAPI
             result = SDL_SYS_JoystickIsHaptic(joystick) || SDL_HIDAPI_JoystickIsHaptic(joystick);
             #else