From 696d9a0d4e431fe57f3c63a56320825ae59e268c Mon Sep 17 00:00:00 2001 From: NepDisk <16447892+NepDisk@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:28:13 -0400 Subject: [PATCH] Revert Use all your momentum to push back the camera This reverts commit e52d569c58eea64fb55d01c53e766a363ceb4944. --- src/p_user.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index f50cfec57..80ed7e0db 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3020,7 +3020,6 @@ 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; @@ -3295,19 +3294,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall // sets ideal cam pos dist = camdist; - /* 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)); + if (player->speed > K_GetKartSpeed(player, false, true)) + dist += 4*(player->speed - K_GetKartSpeed(player, false, true)); dist += abs(thiscam->momz)/4; if (player->karthud[khud_boostcam])