thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UCRP_UFOATTACKMETHOD: Only check roundconditions the frame the UFO is destroyed, not hit

Browse source
This commit is contained in:
toaster 2023-10-17 12:49:50 +01:00
parent d11fe78e90
commit 3836cfddcb
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/objects/ufo.c
View file

@ -855,7 +855,6 @@ static UINT8 GetUFODamage(mobj_t *inflictor, UINT8 damageType)
if (players[g_localplayers[i]].spectator) if (players[g_localplayers[i]].spectator)
continue; continue;
players[i].roundconditions.ufodamaging |= ufodamaging; players[i].roundconditions.ufodamaging |= ufodamaging;
players[i].roundconditions.checkthisframe = true;
} }
} }
@ -929,6 +928,18 @@ boolean Obj_SpecialUFODamage(mobj_t *ufo, mobj_t *inflictor, mobj_t *source, UIN
// Destroy the UFO parts, and make the emerald collectible! // Destroy the UFO parts, and make the emerald collectible!
UFOKillPieces(ufo); UFOKillPieces(ufo);
{
UINT8 i;
for (i = 0; i <= splitscreen; i++)
{
if (!playeringame[g_localplayers[i]])
continue;
if (players[g_localplayers[i]].spectator)
continue;
players[i].roundconditions.checkthisframe = true;
}
}
ufo->flags = (ufo->flags & ~MF_SHOOTABLE) | (MF_SPECIAL|MF_PICKUPFROMBELOW); ufo->flags = (ufo->flags & ~MF_SHOOTABLE) | (MF_SPECIAL|MF_PICKUPFROMBELOW);
ufo->shadowscale = FRACUNIT/3; ufo->shadowscale = FRACUNIT/3;