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

P_SetupEmblem: Correct flags *before* Obj_AudienceInit

Browse source
This commit is contained in:
toaster 2023-04-21 17:37:26 +01:00
parent 945a00df6e
commit af288571bd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_mobj.c
View file

@ -12306,6 +12306,13 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
return false; return false;
} }
// Signal that you are to behave like a follower
mobj->flags2 |= MF2_STRONGBOX;
if (followers[followerpick].mode == FOLLOWERMODE_GROUND)
{
mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
}
// Set up data // Set up data
Obj_AudienceInit(mobj, NULL, followerpick); Obj_AudienceInit(mobj, NULL, followerpick);
if (P_MobjWasRemoved(mobj)) if (P_MobjWasRemoved(mobj))
@ -12313,13 +12320,6 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
CONS_Alert(CONS_WARNING, "P_SetupEmblem: Follower \"%s\" causes emblem for map %d with tag %d to be removed immediately!\n", emblemlocations[j].stringVar2, gamemap, tagnum); CONS_Alert(CONS_WARNING, "P_SetupEmblem: Follower \"%s\" causes emblem for map %d with tag %d to be removed immediately!\n", emblemlocations[j].stringVar2, gamemap, tagnum);
return false; return false;
} }
// Signal that you are to behave like a follower
mobj->flags2 |= MF2_STRONGBOX;
if (followers[followerpick].mode == FOLLOWERMODE_GROUND)
{
mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
}
} }
return true; return true;