From 40a5580e653a32df51f0d8744bce2b367eebf5ea Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Thu, 26 Jan 2023 19:25:56 -0600
Subject: [PATCH] Revert "sdl: Yet more SDL rumble version-guards"
This reverts commit df28ffd72eb168bf392db7cf88a4c58218fe2923.
---
src/sdl/i_gamepad.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/sdl/i_gamepad.c b/src/sdl/i_gamepad.c
index b2b50e43d5..109d37d4aa 100644
--- a/src/sdl/i_gamepad.c
+++ b/src/sdl/i_gamepad.c
@@ -66,11 +66,7 @@ void I_InitGamepads(void)
if (!InitGamepadSubsystems())
return;
-#if SDL_VERSION_ATLEAST(2,0,9)
rumble_supported = !M_CheckParm("-norumble");
-#else
- rumble_supported = false;
-#endif
for (UINT8 i = 0; i < NUM_GAMEPADS; i++)
controllers[i].info = &gamepads[i];
@@ -731,20 +727,14 @@ boolean I_RumbleSupported(void)
static boolean Controller_Rumble(ControllerInfo *c)
{
-#if SDL_VERSION_ATLEAST(2,0,9)
if (SDL_GameControllerRumble(c->dev, c->rumble.large_magnitude, c->rumble.small_magnitude, 0) == -1)
return false;
return true;
-#else
- (void)c;
- return false;
-#endif
}
void I_ToggleControllerRumble(boolean unpause)
{
-#if SDL_VERSION_ATLEAST(2,0,9)
if (!I_RumbleSupported() || rumble_paused == !unpause)
return;
@@ -764,10 +754,6 @@ void I_ToggleControllerRumble(boolean unpause)
controller->rumble.expiration = controller->rumble.time_left = 0;
}
}
-#else
- (void)unpause;
- return;
-#endif
}
void I_UpdateControllers(void)
--
GitLab