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

No flashing tics in Battle

Browse source
This commit is contained in:
Sally Coolatta 2022-01-05 03:17:38 -05:00 • committed by SinnamonLat
parent c68e8fac97
commit 9e5b70ad8f
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -2962,11 +2962,18 @@ UINT16 K_GetKartFlashing(player_t *player)
{ {
UINT16 tics = flashingtics; UINT16 tics = flashingtics;
if (!player) if (gametype == GT_BATTLE)
{
// TODO: gametyperules
return 1;
}
if (player == NULL)
{
return tics; return tics;
}
tics += (tics/8) * (player->kartspeed); tics += (tics/8) * (player->kartspeed);
return tics; return tics;
} }

2
src/p_user.c
View file

@ -4555,7 +4555,7 @@ void P_PlayerThink(player_t *player)
|| (player->pflags & PF_NOCONTEST) // NO CONTEST explosion || (player->pflags & PF_NOCONTEST) // NO CONTEST explosion
|| ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0 && player->karmadelay))) || ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0 && player->karmadelay)))
{ {
if (player->flashing > 0 && player->flashing < K_GetKartFlashing(player) if (player->flashing > 1 && player->flashing < K_GetKartFlashing(player)
&& (leveltime & 1)) && (leveltime & 1))
player->mo->renderflags |= RF_DONTDRAW; player->mo->renderflags |= RF_DONTDRAW;
else else