stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 02:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make Dead / NoClipHeight Objects Immune to Death Pits

Browse source
This commit is contained in:
SMS Alfredo 2023-05-31 23:55:03 -05:00
parent d6d424f102
commit 2ce0c248ed
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_mobj.c
View file

@ -2474,7 +2474,8 @@ boolean P_ZMovement(mobj_t *mo)
break; break;
} }
if (!mo->player && P_CheckDeathPitCollide(mo)) if (!mo->player && P_CheckDeathPitCollide(mo) && mo->health
&& !(mo->flags & MF_NOCLIPHEIGHT) && !(mo->flags2 & MF2_BOSSDEAD))
{ {
switch (mo->type) switch (mo->type)
{ {
@ -2488,10 +2489,7 @@ boolean P_ZMovement(mobj_t *mo)
if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART) if (mo->flags & MF_ENEMY || mo->flags & MF_BOSS || mo->type == MT_MINECART)
{ {
// Kill enemies, bosses and minecarts that fall into death pits. // Kill enemies, bosses and minecarts that fall into death pits.
if (mo->health) P_KillMobj(mo, NULL, NULL, 0);
{
P_KillMobj(mo, NULL, NULL, 0);
}
return !P_MobjWasRemoved(mo); // allows explosion states to run return !P_MobjWasRemoved(mo); // allows explosion states to run
} }
else else
@ -3137,7 +3135,8 @@ boolean P_SceneryZMovement(mobj_t *mo)
break; break;
} }
if (P_CheckDeathPitCollide(mo)) if (!mo->player && P_CheckDeathPitCollide(mo) && mo->health
&& !(mo->flags & MF_NOCLIPHEIGHT) && !(mo->flags2 & MF2_BOSSDEAD))
{ {
P_RemoveMobj(mo); P_RemoveMobj(mo);
return false; return false;