stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 06:00:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop endlessly chasing NIGHTSPULL emblems

Browse source
This commit is contained in:
Sally Coolatta 2022-10-31 18:26:41 -04:00
parent c1e641be43
commit 645dd7d662
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_inter.c
View file

@ -798,6 +798,17 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
boolean prevCollected;
const boolean isServer = ((player - players) == serverplayer);
if ((special->flags2 & MF2_NIGHTSPULL)
&& (toucher == special->tracer))
{
// Since collecting may not remove the object,
// we need to manually stop it from chasing.
P_SetTarget(&special->tracer, NULL);
special->flags2 &= ~MF2_NIGHTSPULL;
special->movefactor = 0;
special->momx = special->momy = special->momz = 0;
}
if (!P_CanPickupEmblem(player, special->health - 1))
{
return;