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

Battle: darken screen while outside of Overtime Barrier

Browse source
This commit is contained in:
James R 2024-01-03 05:18:12 -08:00
parent df0d342e04
commit 05ce2b7861
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/k_kart.c
View file

@ -8796,18 +8796,38 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
K_UpdateTripwire(player); K_UpdateTripwire(player);
if ((battleovertime.enabled >= 10*TICRATE) && !(player->pflags & PF_ELIMINATED) && !player->exiting) if (battleovertime.enabled)
{ {
fixed_t distanceToBarrier = 0; fixed_t distanceToCenter = 0;
if (battleovertime.radius > 0) if (battleovertime.radius > 0)
{ {
distanceToBarrier = R_PointToDist2(player->mo->x, player->mo->y, battleovertime.x, battleovertime.y) - (player->mo->radius * 2); distanceToCenter = R_PointToDist2(player->mo->x, player->mo->y, battleovertime.x, battleovertime.y);
} }
if (distanceToBarrier > battleovertime.radius) if (distanceToCenter + player->mo->radius > battleovertime.radius)
{ {
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER); if (distanceToCenter - (player->mo->radius * 2) > battleovertime.radius &&
(battleovertime.enabled >= 10*TICRATE) &&
!(player->pflags & PF_ELIMINATED) &&
!player->exiting)
{
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER);
}
if (leveltime < player->darkness_end)
{
if (leveltime > player->darkness_end - DARKNESS_FADE_TIME)
{
player->darkness_start = leveltime - (player->darkness_end - leveltime);
}
}
else
{
player->darkness_start = leveltime;
}
player->darkness_end = leveltime + (2 * DARKNESS_FADE_TIME);
} }
} }