stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "sdl: Version-guard rumble and extended buttons"

Browse source 
This reverts commit f5f224136b.
This commit is contained in:
Eidolon 2023-01-26 19:25:59 -06:00
parent 40a5580e65
commit 2810a46095
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/sdl/i_gamepad.c
View file

@ -231,7 +231,6 @@ static boolean Controller_OpenDevice(UINT8 which, INT32 devindex)
controller->info->type = GAMEPAD_TYPE_UNKNOWN; controller->info->type = GAMEPAD_TYPE_UNKNOWN;
#endif // SDL_VERSION_ATLEAST(2,0,12) #endif // SDL_VERSION_ATLEAST(2,0,12)
#if SDL_VERSION_ATLEAST(2,0,6)
// Check the device vendor and product to find out what controller this actually is // Check the device vendor and product to find out what controller this actually is
Uint16 vendor = SDL_JoystickGetDeviceVendor(devindex); Uint16 vendor = SDL_JoystickGetDeviceVendor(devindex);
Uint16 product = SDL_JoystickGetDeviceProduct(devindex); Uint16 product = SDL_JoystickGetDeviceProduct(devindex);
@ -240,17 +239,13 @@ static boolean Controller_OpenDevice(UINT8 which, INT32 devindex)
controller->info->type = GAMEPAD_TYPE_XBOX_SERIES_XS; controller->info->type = GAMEPAD_TYPE_XBOX_SERIES_XS;
else if (IsJoystickXboxOneElite(vendor, product)) else if (IsJoystickXboxOneElite(vendor, product))
controller->info->type = GAMEPAD_TYPE_XBOX_ELITE; controller->info->type = GAMEPAD_TYPE_XBOX_ELITE;
#endif
CONS_Debug(DBG_GAMELOGIC, M_GetText(" Type: %s\n"), G_GamepadTypeToString(controller->info->type)); CONS_Debug(DBG_GAMELOGIC, M_GetText(" Type: %s\n"), G_GamepadTypeToString(controller->info->type));
#if SDL_VERSION_ATLEAST(2,0,12)
// Change the ring LEDs on Xbox 360 controllers // Change the ring LEDs on Xbox 360 controllers
// FIXME: Doesn't seem to work? // FIXME: Doesn't seem to work?
SDL_GameControllerSetPlayerIndex(controller->dev, which); SDL_GameControllerSetPlayerIndex(controller->dev, which);
#endif
#if SDL_VERSION_ATLEAST(2,0,18)
// Check if rumble is supported // Check if rumble is supported
if (SDL_GameControllerHasRumble(controller->dev) == SDL_TRUE) if (SDL_GameControllerHasRumble(controller->dev) == SDL_TRUE)
{ {
@ -260,12 +255,8 @@ static boolean Controller_OpenDevice(UINT8 which, INT32 devindex)
else else
{ {
controller->info->rumble.supported = false; controller->info->rumble.supported = false;
CONS_Debug(DBG_GAMELOGIC, M_GetText(" Rumble supported: No\n")); CONS_Debug(DBG_GAMELOGIC, M_GetText(" Rumble supported: No\n"));;
} }
#else
controller->info->rumble.supported = true;
CONS_Debug(DBG_GAMELOGIC, M_GetText(" Rumble supported: Maybe\n"));
#endif // SDL_VERSION_ATLEAST(2,0,18)
if (!controller->info->connected) if (!controller->info->connected)
{ {
@ -609,14 +600,12 @@ void I_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint32 type)
GAMEPAD_BUTTON_CASE(DPAD_DOWN); GAMEPAD_BUTTON_CASE(DPAD_DOWN);
GAMEPAD_BUTTON_CASE(DPAD_LEFT); GAMEPAD_BUTTON_CASE(DPAD_LEFT);
GAMEPAD_BUTTON_CASE(DPAD_RIGHT); GAMEPAD_BUTTON_CASE(DPAD_RIGHT);
#if SDL_VERSION_ATLEAST(2,0,14)
GAMEPAD_BUTTON_CASE(MISC1); GAMEPAD_BUTTON_CASE(MISC1);
GAMEPAD_BUTTON_CASE(PADDLE1); GAMEPAD_BUTTON_CASE(PADDLE1);
GAMEPAD_BUTTON_CASE(PADDLE2); GAMEPAD_BUTTON_CASE(PADDLE2);
GAMEPAD_BUTTON_CASE(PADDLE3); GAMEPAD_BUTTON_CASE(PADDLE3);
GAMEPAD_BUTTON_CASE(PADDLE4); GAMEPAD_BUTTON_CASE(PADDLE4);
GAMEPAD_BUTTON_CASE(TOUCHPAD); GAMEPAD_BUTTON_CASE(TOUCHPAD);
#endif
default: return; default: return;
} }
@ -674,10 +663,8 @@ static void Controller_StopRumble(UINT8 num)
gamepad->rumble.data.small_magnitude = 0; gamepad->rumble.data.small_magnitude = 0;
gamepad->rumble.data.duration = 0; gamepad->rumble.data.duration = 0;
#if SDL_VERSION_ATLEAST(2,0,9)
if (gamepad->rumble.supported) if (gamepad->rumble.supported)
SDL_GameControllerRumble(controller->dev, 0, 0, 0); SDL_GameControllerRumble(controller->dev, 0, 0, 0);
#endif
} }
static void Controller_Close(UINT8 num) static void Controller_Close(UINT8 num)