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 'emerald-instawhip-lockout' into 'master'

Browse source 
Allow SS Emerald pickup while instawhip charging

See merge request KartKrew/Kart!2257
This commit is contained in:
James R. 2024-04-11 01:37:22 +00:00
commit 19c726390a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/objects/ufo.c
View file

@ -1050,7 +1050,7 @@ boolean Obj_UFOEmeraldCollect(mobj_t *ufo, mobj_t *toucher)
if (toucher->player != NULL)
{
if (P_CanPickupItem(toucher->player, 0) == false)
if (toucher->player->exiting || mapreset || (toucher->player->pflags & PF_ELIMINATED))
{
return false;
}