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

Merge branch 'despawn-empty-kart' into 'master'

Browse source 
Add 5 second fuse for empty kart, flickers right before despawning

See merge request KartKrew/Kart!961
This commit is contained in:
Oni 2023-02-22 09:56:11 +00:00
commit 5dddf4c5e9
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_inter.c
View file

@ -1353,6 +1353,8 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
if (target->player->pflags & PF_NOCONTEST)
P_SetTarget(&target->tracer, kart);
kart->fuse = 5*TICRATE;
}
if (source && !P_MobjWasRemoved(source))

1
src/p_mobj.c
View file

@ -9601,6 +9601,7 @@ static boolean P_CanFlickerFuse(mobj_t *mobj)
case MT_FALLINGROCK:
case MT_FLOATINGITEM:
case MT_POGOSPRING:
case MT_KART_LEFTOVER:
if (mobj->fuse <= TICRATE)
{
return true;