From 4fc82f0f531d60157ac59bf60327caab86e1f7d9 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 9 Dec 2021 21:28:46 -0800
Subject: [PATCH] Squish during huge vertical momentum

YIKES
---
 src/k_kart.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index c7b406dc4..6b4a3dfc0 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -4548,10 +4548,15 @@ void K_Squish(mobj_t *mo)
 	const fixed_t factor = 5 * mo->height / 4;
 	const fixed_t threshold = factor / 6;
 
-	const fixed_t old3dspeed = abs(mo->lastmomz);
-	const fixed_t new3dspeed = abs(mo->momz);
+	fixed_t old3dspeed = abs(mo->lastmomz);
+	fixed_t new3dspeed = abs(mo->momz);
 
-	const fixed_t delta = abs(old3dspeed - new3dspeed);
+	fixed_t delta = abs(old3dspeed - new3dspeed);
+	fixed_t grav = mo->height/3;
+	fixed_t add = abs(grav - new3dspeed);
+
+	if (delta < 2 * add && new3dspeed > grav)
+		delta += add;
 
 	if (delta > threshold)
 	{
@@ -4561,7 +4566,7 @@ void K_Squish(mobj_t *mo)
 		if (mo->spritexscale > maxstretch)
 			mo->spritexscale = maxstretch;
 
-		if (abs(new3dspeed) > abs(old3dspeed))
+		if (new3dspeed > old3dspeed || new3dspeed > grav)
 		{
 			mo->spritexscale =
 				FixedDiv(FRACUNIT, mo->spritexscale);