diff --git a/src/p_tick.c b/src/p_tick.c index 4c4bec04c..9c7eb891f 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -340,7 +340,7 @@ static inline void P_DeviceRumbleTick(void) { UINT8 i; - if (cv_rumble[0].value == 0 && cv_rumble[1].value == 0 && cv_rumble[2].value == 0 && cv_rumble[3].value == 0) + if (I_NumJoys() == 0 || (cv_rumble[0].value == 0 && cv_rumble[1].value == 0 && cv_rumble[2].value == 0 && cv_rumble[3].value == 0)) { return; } @@ -357,6 +357,9 @@ static inline void P_DeviceRumbleTick(void) if (!playeringame[displayplayers[i]] || player->spectator) continue; + if (G_GetDeviceForPlayer(i) == 0) + continue; + if (player->exiting) continue;