stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-14 17:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'katsy/spikysituation' into 2210-rc1

Browse source
This commit is contained in:
spherallic 2022-02-21 21:27:09 +01:00
commit c1bf16eb09
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_mobj.c
View file

@ -13007,7 +13007,10 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
P_SetMobjState(mobj, mobj->info->meleestate);
}
else
{
mobj->floorz = mobj->z;
mobj->flags |= MF_NOTHINK;
}
// no collision for spikes if the ambush flag is checked
if ((mthing->options & MTF_AMBUSH) || metalrecording)
{