From 9042f31dc3a52f3fc6b14063c6ae4af8a489ece0 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 26 Sep 2020 02:47:27 -0400 Subject: [PATCH] Fix precipitation not working --- src/p_mobj.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 2e7fdb201..acbc5cd2a 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3592,19 +3592,19 @@ void P_PrecipThinker(precipmobj_t *mobj) return; // adjust height - if ((mobj->z += mobj->momz) > mobj->floorz) - return; - - // no splashes on sky or bottomless pits - if (mobj->precipflags & PCF_PIT) + if ((mobj->z += mobj->momz) <= mobj->floorz) { - mobj->z = mobj->ceilingz; - return; + if ((mobj->info->deathstate == S_NULL) || (mobj->precipflags & PCF_PIT)) // no splashes on sky or bottomless pits + { + mobj->z = mobj->ceilingz; + } + else + { + P_SetPrecipMobjState(mobj, mobj->info->deathstate); + mobj->z = mobj->floorz; + mobj->precipflags |= PCF_SPLASH; + } } - - mobj->z = mobj->floorz; - P_SetPrecipMobjState(mobj, mobj->info->deathstate); - mobj->precipflags |= PCF_SPLASH; } static void P_RingThinker(mobj_t *mobj)