From c786dbda78f28b634442dceb86d4022c5e598866 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Thu, 29 Sep 2016 13:06:07 +0100
Subject: [PATCH] Improved the way GFZ3 Eggman slows down in the air when
 MF2_SKULLFLYing.

---
 src/p_mobj.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index e1c45dd72..b249e6741 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4438,12 +4438,11 @@ static void P_Boss1Thinker(mobj_t *mobj)
 
 	if (mobj->flags2 & MF2_SKULLFLY)
 	{
-		if (P_MobjFlip(mobj)*mobj->momz > 0
-			&& ((mobj->eflags & MFE_VERTICALFLIP
-				&& (mobj->z+mobj->height) < (mobj->ceilingz-(2*mobj->height)))
-			|| (!(mobj->eflags & MFE_VERTICALFLIP)
-				&& mobj->z > (mobj->floorz+(2*mobj->height)))))
-			mobj->momz = FixedMul(mobj->momz, 60000);
+		fixed_t dist = (mobj->eflags & MFE_VERTICALFLIP)
+						? ((mobj->ceilingz-(2*mobj->height)) - (mobj->z+mobj->height))
+						: (mobj->z - (mobj->floorz+(2*mobj->height)));
+		if (dist > 0 && P_MobjFlip(mobj)*mobj->momz > 0)
+			mobj->momz = FixedMul(mobj->momz, FRACUNIT - (dist>>12));
 	}
 	else if (mobj->state != &states[mobj->info->spawnstate] && mobj->health > 0 && mobj->flags & MF_FLOAT)
 		mobj->momz = FixedMul(mobj->momz,7*FRACUNIT/8);