瀏覽代碼

haptic: Enable gamepad haptic support under sdl2-compat

(cherry picked from commit c677c913a634a9ecf1e131f089fb31415382b722)
Cameron Gutman 1 周之前
父節點
當前提交
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