From 682a8f68295b1b643c6e25f79108ff37b2e0c842 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Wed, 8 May 2019 20:49:47 +0100
Subject: [PATCH] Disable the speedcap on players. Don't calculate acceleration
 as ever being above top speed.

---
 src/k_kart.c | 11 +++++++----
 src/p_user.c |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index d9bc1f26d..18ef5ac90 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1636,7 +1636,7 @@ static void K_DrawDraftCombiring(player_t *player, player_t *victim, fixed_t cur
 		curx += stepx;
 		cury += stepy;
 		curz += stepz;
-	
+
 		offset = abs(offset-1) % 3;
 		n--;
 	}
@@ -2241,7 +2241,7 @@ static void K_GetKartBoostPower(player_t *player)
 	{
 		speedboost += (player->kartstuff[k_draftpower]) / 3; // + 0 to 33.3% top speed
 		//accelboost += (FRACUNIT / 3); // + 33.3% acceleration
-		numboosts++; // (Drafting suffers no boost stack penalty!) 
+		numboosts++; // (Drafting suffers no boost stack penalty!)
 	}
 
 	player->kartstuff[k_boostpower] = boostpower;
@@ -2319,6 +2319,9 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
 
 	// ACCELCODE!!!1!11!
 	oldspeed = R_PointToDist2(0, 0, player->rmomx, player->rmomy); // FixedMul(P_AproxDistance(player->rmomx, player->rmomy), player->mo->scale);
+	// Don't calculate the acceleration as ever being above top speed
+	if (oldspeed > p_speed)
+		oldspeed = p_speed;
 	newspeed = FixedDiv(FixedDiv(FixedMul(oldspeed, accelmax - p_accel) + FixedMul(p_speed, p_accel), accelmax), ORIG_FRICTION);
 
 	if (player->kartstuff[k_pogospring]) // Pogo Spring minimum/maximum thrust
@@ -3413,7 +3416,7 @@ void K_SpawnDraftDust(mobj_t *mo)
 
 			ang = mo->player->frameangle;
 
-			if (mo->player->kartstuff[k_drift] != 0) 
+			if (mo->player->kartstuff[k_drift] != 0)
 			{
 				drifting = true;
 				ang += (mo->player->kartstuff[k_drift] * ((ANGLE_270 + ANGLE_22h) / 5)); // -112.5 doesn't work. I fucking HATE SRB2 angles
@@ -8382,7 +8385,7 @@ static void K_drawKartRingsAndLives(void)
 	}
 	else if (stplyr->kartstuff[k_rings] >= 20) // Maxed out
 		ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE);
-	
+
 
 	if (netgame)
 		V_DrawScaledPatch(LAPS_X, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringsticker[1]);
diff --git a/src/p_user.c b/src/p_user.c
index d4e6a03de..a331d56b7 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4184,6 +4184,7 @@ static void P_3dMovement(player_t *player)
 	// If "no" to 2, normalize to topspeed, so we can't suddenly run faster than it of our own accord.
 	// If "no" to 1, we're not reaching any limits yet, so ignore this entirely!
 	// -Shadow Hog
+	/*
 	newMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0);
 	if (newMagnitude > K_GetKartSpeed(player, true)) //topspeed)
 	{
@@ -4207,6 +4208,7 @@ static void P_3dMovement(player_t *player)
 			player->mo->momy = tempmomy + player->cmomy;
 		}
 	}
+	*/
 }
 
 //
@@ -7352,7 +7354,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	if (P_CameraThinker(player, thiscam, resetcalled))
 		return true;
 
-	
+
 	if (thiscam == &camera[1]) // Camera 2
 	{
 		num = 1;