From 4c9b9f0e6411fd69c4db59e10a8847941e00aa86 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Fri, 26 Apr 2024 22:31:12 -0400
Subject: [PATCH] Fix drift end kick-out regression from SRB2Kart

---
 src/k_kart.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index fba7c2f99e..ee520775cc 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -10336,7 +10336,7 @@ static INT16 K_GetKartDriftValue(const player_t *player, fixed_t countersteer)
 	}
 #endif
 
-	return basedrift + (FixedMul(driftadjust * FRACUNIT, countersteer) / FRACUNIT);
+	return basedrift + FixedMul(driftadjust, countersteer);
 }
 
 INT16 K_UpdateSteeringValue(INT16 inputSteering, INT16 destSteering)
@@ -10477,16 +10477,20 @@ INT16 K_GetKartTurnValue(const player_t *player, INT16 turnvalue)
 
 	if (player->drift != 0 && P_IsObjectOnGround(player->mo))
 	{
-		fixed_t countersteer = FixedDiv(turnfixed, KART_FULLTURN*FRACUNIT);
-
-		// If we're drifting we have a completely different turning value
-
 		if (player->pflags & PF_DRIFTEND)
 		{
-			countersteer = FRACUNIT;
+			// Sal: K_GetKartDriftValue is short-circuited to give a weird additive magic number,
+			// instead of an entirely replaced turn value. This gaslit me years ago when I was doing a
+			// code readability pass, where I missed that fact because it also returned early.
+			turnfixed += K_GetKartDriftValue(player, FRACUNIT) * FRACUNIT;
+			return (turnfixed / FRACUNIT);
+		}
+		else
+		{
+			// If we're drifting we have a completely different turning value
+			fixed_t countersteer = FixedDiv(turnfixed, KART_FULLTURN * FRACUNIT);
+			return K_GetKartDriftValue(player, countersteer);
 		}
-
-		return K_GetKartDriftValue(player, countersteer);
 	}
 
 	fixed_t finalhandleboost = player->handleboost;
-- 
GitLab