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

Merge branch 'thespikesagaepisode3' into 'next'

Browse source 
Exclude non-solid objects from spike eject (resolves #706)

Closes #706

See merge request STJr/SRB2!1674
This commit is contained in:
Sal 2023-07-24 09:17:07 +00:00
commit 50d8becf55
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/p_map.c
View file

@ -1166,7 +1166,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
}
// When solid spikes move, assume they just popped up and teleport things on top of them to hurt.
if (tmthing->type == MT_SPIKE && tmthing->flags & MF_SOLID)
if (tmthing->type == MT_SPIKE && (thing->flags & MF_SOLID) && (tmthing->flags & MF_SOLID))
{
if (thing->z > tmthing->z + tmthing->height)
return true; // overhead