thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix overtime barrier not applying to bombs/flashing players

Browse source
This commit is contained in:
Sally Coolatta 2020-10-24 11:33:07 -04:00
parent c92871d317
commit dc7fe0bd58
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/k_kart.c
View file

@ -5770,23 +5770,23 @@ 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)
{
fixed_t distanceToBarrier = 0;
if (battleovertime.radius > 0)
{ {
fixed_t distanceToBarrier = 0; distanceToBarrier = R_PointToDist2(player->mo->x, player->mo->y, battleovertime.x, battleovertime.y) - (player->mo->radius * 2);
}
if (battleovertime.radius > 0) if (distanceToBarrier > battleovertime.radius)
{ {
distanceToBarrier = R_PointToDist2(player->mo->x, player->mo->y, battleovertime.x, battleovertime.y) - (player->mo->radius * 2); P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER);
}
if (distanceToBarrier > battleovertime.radius)
{
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER);
}
} }
} }