mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-03-12 22:02:12 +00:00
Merge branch 'waterdrop' into 'next'
Add collision check for flipped water drops Closes #735 See merge request STJr/SRB2!1697
This commit is contained in:
commit
61e6226f66
1 changed files with 2 additions and 1 deletions
|
@ -7740,7 +7740,8 @@ static void P_MobjSceneryThink(mobj_t *mobj)
|
|||
break;
|
||||
case MT_WATERDROP:
|
||||
P_SceneryCheckWater(mobj);
|
||||
if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)
|
||||
if (((!(mobj->eflags & MFE_VERTICALFLIP) && (mobj->z <= mobj->floorz || mobj->z <= mobj->watertop))
|
||||
|| (mobj->eflags & MFE_VERTICALFLIP && mobj->z + mobj->height >= mobj->ceilingz))
|
||||
&& mobj->health > 0)
|
||||
{
|
||||
mobj->health = 0;
|
||||
|
|
Loading…
Reference in a new issue