From f35cd729b04f2fbfc0be5973dcaede5b4b66183f Mon Sep 17 00:00:00 2001
From: pastel <hazepastel@proton.me>
Date: Wed, 11 Dec 2024 16:57:39 -0600
Subject: [PATCH] no need to divide this
---
src/p_mobj.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 65369934f3..8bad6f60f9 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3134,8 +3134,8 @@ void P_MobjCheckWater(mobj_t *mobj)
mobj->eflags |= MFE_TOUCHWATER;
// Actually in the water?
- if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - ((mobj->momz/2) + (height>>1)) > bottomheight)
- || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + ((mobj->momz/2) + (height>>1)) < topheight))
+ if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - (mobj->momz + (height>>1)) > bottomheight)
+ || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + (mobj->momz + (height>>1)) < topheight))
mobj->eflags |= MFE_UNDERWATER;
if (mobj->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER))
@@ -6656,12 +6656,12 @@ static boolean P_ShieldLook(mobj_t *thing, shieldtype_t shield)
if (scale < 1) {
P_SetScale(thing, thing->target->scale, true);
thing->old_scale = thing->target->old_scale;
-
+
thing->flags2 |= (MF2_DONTDRAW|MF2_JUSTATTACKED); //Hide and indicate we're hidden
} else {
P_SetScale(thing, scale, true);
thing->old_scale = FixedMul(thing->target->old_scale, thing->target->player->shieldscale);
-
+
//Only unhide if we were hidden by the above code
if (thing->flags2 & MF2_JUSTATTACKED)
thing->flags2 &= ~(MF2_DONTDRAW|MF2_JUSTATTACKED);
--
GitLab