Uncommented checks for PlayStation controllers when a game uses Windo…

…ws.Gaming.Input warning about potential incompatibility.
SpecialKO · Dec 8, 2024 · 12c42a0 · 12c42a0
1 parent c499d1d
commit 12c42a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,9 @@
-24.12.3
+24.12.8
+=======
+ + Uncommented checks for PlayStation controllers when a game uses
+     Windows.Gaming.Input warning about potential incompatibility.
+
+24.12.3
 =======
  + Various changes to ensure GameInput games do not read from the same memory
      that SK's input I/O threads are actively writing to, lockless of course.

diff --git a/include/SpecialK/DLL_VERSION.H b/include/SpecialK/DLL_VERSION.H
@@ -2,7 +2,7 @@
 
 #define SK_YEAR  24
 #define SK_MONTH 12
-#define SK_DATE  3
+#define SK_DATE  8
 #define SK_REV_N 0
 #define SK_REV   0
 

diff --git a/src/input/windows.gaming.input.cpp b/src/input/windows.gaming.input.cpp
@@ -998,10 +998,10 @@ RoGetActivationFactory_Detour ( _In_  HSTRING activatableClassId,
       SK_HID_SetupPlayStationControllers ()
     );
 
-    //const bool bHasPlayStationControllers =
-    //     (! SK_HID_PlayStationControllers.empty ());
-    //
-    //if (bHasPlayStationControllers)
+    const bool bHasPlayStationControllers =
+         (! SK_HID_PlayStationControllers.empty ());
+
+    if (bHasPlayStationControllers)
     { 
       if ((! config.input.gamepad.xinput.emulate) && SK_GetCurrentGameID () != SK_GAME_ID::HorizonForbiddenWest      &&
                                                      SK_GetCurrentGameID () != SK_GAME_ID::RatchetAndClank_RiftApart &&