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

Merge branch 'special-out' into 'master'

Browse source 
Special Out

See merge request KartKrew/Kart!921
This commit is contained in:
Oni 2023-02-17 05:04:34 +00:00
commit a7a3a2c5d5
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -7236,7 +7236,9 @@ void K_KartPlayerHUDUpdate(player_t *player)
player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time
} }
if (player->exiting) if (player->exiting
&& (specialstageinfo.valid == false
|| !(player->pflags & PF_NOCONTEST)))
{ {
if (player->karthud[khud_finish] <= 2*TICRATE) if (player->karthud[khud_finish] <= 2*TICRATE)
player->karthud[khud_finish]++; player->karthud[khud_finish]++;

6
src/p_inter.c
View file

@ -1901,6 +1901,12 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
{ {
(void)source; (void)source;
if (!player->exiting && specialstageinfo.valid == true)
{
player->pflags |= PF_NOCONTEST;
P_DoPlayerExit(player);
}
if (player->exiting) if (player->exiting)
{ {
player->mo->destscale = 1; player->mo->destscale = 1;

5
src/p_spec.c
View file

@ -2011,8 +2011,11 @@ static void K_HandleLapIncrement(player_t *player)
player->pflags |= PF_NOCONTEST; player->pflags |= PF_NOCONTEST;
} }
} }
P_DoPlayerExit(player); P_DoPlayerExit(player);
P_SetupSignExit(player);
if (!(player->pflags & PF_NOCONTEST))
P_SetupSignExit(player);
} }
else else
{ {

2
src/p_user.c
View file

@ -1314,7 +1314,7 @@ void P_DoPlayerExit(player_t *player)
{ {
if (specialstageinfo.valid == true && losing == true) if (specialstageinfo.valid == true && losing == true)
{ {
exitcountdown = (5*TICRATE)/2; exitcountdown = TICRATE;
} }
else else
{ {