From 55d47c7cf8f10540981b1d37fa0af32809c1f391 Mon Sep 17 00:00:00 2001
From: NepDisk <16447892+NepDisk@users.noreply.github.com>
Date: Sat, 14 Sep 2024 00:22:55 -0400
Subject: [PATCH] Revert Revert Use all your momentum to push back the camera

This reverts commit 696d9a0d4e431fe57f3c63a56320825ae59e268c.
---
 src/p_user.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/p_user.c b/src/p_user.c
index 80ed7e0db..f50cfec57 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -3020,6 +3020,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	UINT8 timeover;
 	mobj_t *mo;
 	fixed_t f1, f2;
+	fixed_t speed;
 #ifndef NOCLIPCAM
 	boolean cameranoclip;
 	subsector_t *newsubsec;
@@ -3294,8 +3295,19 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	// sets ideal cam pos
 	dist = camdist;
 
-	if (player->speed > K_GetKartSpeed(player, false, true))
-		dist += 4*(player->speed - K_GetKartSpeed(player, false, true));
+	/* player->speed subtracts conveyors, janks up the camera */
+	if (player->loop.radius)
+	{
+		speed = player->speed;
+	}
+	else
+	{
+		speed = R_PointToDist2(0, 0, player->mo->momx, player->mo->momy);
+	}
+	
+	
+	if (speed > K_GetKartSpeed(player, false, true))
+		dist += 4*(speed - K_GetKartSpeed(player, false, true));
 	dist += abs(thiscam->momz)/4;
 
 	if (player->karthud[khud_boostcam])