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

Merge branch 'fix-invisible-grow' into 'master'

Browse source 
Fix invisible Grow (resolves #757)

Closes #757

See merge request KartKrew/Kart!1614
This commit is contained in:
Oni 2023-11-13 13:31:17 +00:00
commit c0241f27b2
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_user.c
View file

@ -4390,12 +4390,12 @@ void P_PlayerThink(player_t *player)
} }
} }
boolean deathcontrolled = (player->respawn.state != RESPAWNST_NONE && player->respawn.truedeath == true)
|| (player->pflags & PF_NOCONTEST) || (player->karmadelay);
boolean powercontrolled = (player->hyudorotimer) || (player->growshrinktimer > 0);
// Flash player after being hit. // Flash player after being hit.
if (!(player->hyudorotimer // SRB2kart - fixes Hyudoro not flashing when it should. if (!deathcontrolled && !powercontrolled)
|| player->growshrinktimer > 0 // Grow doesn't flash either.
|| (player->respawn.state != RESPAWNST_NONE && player->respawn.truedeath == true) // Respawn timer (for drop dash effect)
|| (player->pflags & PF_NOCONTEST) // NO CONTEST explosion
|| player->karmadelay))
{ {
if (player->flashing > 1 && player->flashing < K_GetKartFlashing(player) if (player->flashing > 1 && player->flashing < K_GetKartFlashing(player)
&& (leveltime & 1)) && (leveltime & 1))
@ -4403,6 +4403,10 @@ void P_PlayerThink(player_t *player)
else else
player->mo->renderflags &= ~RF_DONTDRAW; player->mo->renderflags &= ~RF_DONTDRAW;
} }
else if (!deathcontrolled)
{
player->mo->renderflags &= ~RF_DONTDRAW;
}
if (player->stairjank > 0) if (player->stairjank > 0)
{ {