From f9c9e0829a665071bcf5e8b0e98e6d98041dfa2f Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Thu, 26 Jan 2023 19:25:53 -0600
Subject: [PATCH] Revert "sdl: I can't believe it's more version-guards"
This reverts commit fdb6f2aff93e91cfc1dac24804c912d8b0dc31e6.
---
src/sdl/i_gamepad.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/sdl/i_gamepad.c b/src/sdl/i_gamepad.c
index ecde251fba..b2b50e43d5 100644
--- a/src/sdl/i_gamepad.c
+++ b/src/sdl/i_gamepad.c
@@ -103,7 +103,6 @@ INT32 I_NumGamepads(void)
#define USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO2 0x4001
#define USB_PRODUCT_XBOX_SERIES_X_POWERA_SPECTRA 0x4002
-#if SDL_VERSION_ATLEAST(2,0,6)
static boolean IsJoystickXboxOneElite(Uint16 vendor_id, Uint16 product_id)
{
if (vendor_id == USB_VENDOR_MICROSOFT) {
@@ -142,7 +141,6 @@ static boolean IsJoystickXboxSeriesXS(Uint16 vendor_id, Uint16 product_id)
return false;
}
-#endif
// Opens a controller device
static boolean Controller_OpenDevice(UINT8 which, INT32 devindex)
@@ -887,7 +885,6 @@ boolean I_SetGamepadSmallMotorFreq(UINT8 which, fixed_t freq)
void I_SetGamepadRumblePaused(UINT8 which, boolean pause)
{
-#if SDL_VERSION_ATLEAST(2,0,9)
if (!I_RumbleSupported() || which >= NUM_GAMEPADS)
return;
@@ -918,11 +915,6 @@ void I_SetGamepadRumblePaused(UINT8 which, boolean pause)
}
controller->info->rumble.paused = pause;
-#else
- (void)which;
- (void)pause;
- return;
-#endif
}
boolean I_GetGamepadRumbleSupported(UINT8 which)
--
GitLab