diff --git a/src/g_input.c b/src/g_input.c index 85de4c6ec..963663504 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -963,11 +963,8 @@ static void G_ResetPlayerDeviceRumble(INT32 playernum) void G_ResetAllDeviceRumbles(void) { int i; - int devices; - devices = I_NumJoys(); - - for (i = 0; i < devices; i++) + for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) { I_GamepadRumble(i, 0, 0, 0); } diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index b622c4c45..549fdf7bd 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -1485,6 +1485,7 @@ void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, (void)duration; #else SDL_GameController *controller = JoyInfo[playernum].dev; + if (controller == NULL) { return; @@ -1503,6 +1504,7 @@ void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 b (void)blue; #else SDL_GameController *controller = JoyInfo[playernum].dev; + if (controller == NULL) { return;