Fix overtime barrier not applying to bombs/flashing players

This commit is contained in:
Sally Coolatta 2020-10-24 11:33:07 -04:00
parent c92871d317
commit dc7fe0bd58

View file

@ -5770,9 +5770,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
K_KartPlayerHUDUpdate(player); K_KartPlayerHUDUpdate(player);
if ((gametyperules & GTR_BUMPERS) && player->bumpers > 0 && !P_PlayerInPain(player) && !player->powers[pw_flashing]) if ((gametyperules & GTR_WANTED) && player->bumpers > 0 && !P_PlayerInPain(player) && !player->powers[pw_flashing])
{ {
player->kartstuff[k_wanted]++; player->kartstuff[k_wanted]++;
}
if (battleovertime.enabled >= 10*TICRATE) if (battleovertime.enabled >= 10*TICRATE)
{ {
@ -5788,7 +5789,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER); P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER);
} }
} }
}
if (P_IsObjectOnGround(player->mo)) if (P_IsObjectOnGround(player->mo))
player->kartstuff[k_waterskip] = 0; player->kartstuff[k_waterskip] = 0;