diff --git a/src/d_main.c b/src/d_main.c index bbe81145d..fb7a98a6e 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -224,10 +224,7 @@ static void D_DeviceLEDTick(void) for (i = 0; i <= splitscreen; i++) { - if (!cv_usejoystick[i].value) - continue; - - if (!cv_gamepadled[i].value) + if (!cv_usejoystick[i].value || !cv_gamepadled[i].value) continue; color[i] = G_GetSkinColor(i); diff --git a/src/p_tick.c b/src/p_tick.c index 5743f18ff..3a49319f7 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -383,19 +383,14 @@ static void P_DeviceRumbleTick(void) UINT16 low = 0; UINT16 high = 0; - if (!cv_usejoystick[i].value) - { - continue; - } - - if (!cv_rumble[i].value) + if (!cv_usejoystick[i].value || !cv_rumble[i].value) { continue; } player_t *player = ((i == 0) ? &players[consoleplayer] : &players[displayplayers[i]]); - if (player->spectator) + if (player->spectator || !player->mo) { continue; } @@ -405,11 +400,6 @@ static void P_DeviceRumbleTick(void) continue; } - if (P_MobjWasRemoved(player->mo)) - { - continue; - } - if (player->exiting) { G_PlayerDeviceRumble(i, low, high, 0);