lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore

This commit is contained in:
MascaraSnake 2019-12-23 20:12:45 +01:00
parent eab5f8c851
commit 2b3922a8f3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/p_mobj.c
View File

@ -13033,12 +13033,11 @@ void P_SpawnMapThing(mapthing_t *mthing)
if (doangle)
mobj->angle = FixedAngle(mthing->angle<<FRACBITS);
mthing->mobj = mobj;
// ignore MTF_ flags and return early
if (i == MT_NIGHTSBUMPER)
{
mthing->mobj = mobj;
return;
}
if ((mthing->options & MTF_AMBUSH)
&& (mthing->options & MTF_OBJECTSPECIAL)
@ -13073,8 +13072,6 @@ void P_SpawnMapThing(mapthing_t *mthing)
// Final set of not being able to draw nightsitems.
if (mobj->flags & MF_NIGHTSITEM)
mobj->flags2 |= MF2_DONTDRAW;
mthing->mobj = mobj;
}
static void P_SpawnHoop(mapthing_t* mthing, fixed_t x, fixed_t y, fixed_t z, sector_t* sec, INT32 hoopsize, fixed_t sizefactor)