diff --git a/src/k_kart.c b/src/k_kart.c index fba7c2f99e689ba3c4b80a96ce151559b335f7f3..ee520775ccca16484a6db5bbc0765b7b1bf397be 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;