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 'fix-death-ghost-segfault' into 'next'

Browse source 
Fix segfault when ghost dies from a death pit

Closes #999

See merge request STJr/SRB2!2026
This commit is contained in:
sphere 2023-06-19 22:31:55 +00:00
commit c1d3af0449
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_mobj.c
View file

@ -3139,7 +3139,8 @@ boolean P_SceneryZMovement(mobj_t *mo)
if (P_CheckDeathPitCollide(mo))
{
P_RemoveMobj(mo);
if (mo->type != MT_GHOST) // ghosts play death animations instead, so don't remove them
P_RemoveMobj(mo);
return false;
}