From 9b5db6fedb8eba2f7c2de89748b35a1a6bb1fff9 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 22 Mar 2023 15:41:19 -0700 Subject: [PATCH] Add K_MomentumThreshold, raise threshold for K_MomentumAngle to 6 FU, same as K_AirFailsafe --- src/k_kart.c | 9 +++++++-- src/k_kart.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index bd5ff9ee2..9722996de 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3485,9 +3485,14 @@ fixed_t K_3dKartMovement(player_t *player) return finalspeed; } +fixed_t K_MomentumThreshold(const mobj_t *mo) +{ + return 6 * mo->scale; +} + angle_t K_MomentumAngle(mobj_t *mo) { - if (FixedHypot(mo->momx, mo->momy) >= mo->scale) + if (FixedHypot(mo->momx, mo->momy) > K_MomentumThreshold(mo)) { return R_PointToAngle2(0, 0, mo->momx, mo->momy); } @@ -10076,7 +10081,7 @@ boolean K_FastFallBounce(player_t *player) static void K_AirFailsafe(player_t *player) { - const fixed_t maxSpeed = 6*player->mo->scale; + const fixed_t maxSpeed = K_MomentumThreshold(player->mo); const fixed_t thrustSpeed = 6*player->mo->scale; // 10*player->mo->scale if (player->speed > maxSpeed // Above the max speed that you're allowed to use this technique. diff --git a/src/k_kart.h b/src/k_kart.h index b015c000e..3553dd5e5 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -83,6 +83,7 @@ void K_KartPlayerHUDUpdate(player_t *player); void K_KartResetPlayerColor(player_t *player); void K_KartPlayerThink(player_t *player, ticcmd_t *cmd); void K_KartPlayerAfterThink(player_t *player); +fixed_t K_MomentumThreshold(const mobj_t *mo); angle_t K_MomentumAngle(mobj_t *mo); void K_AddHitLag(mobj_t *mo, INT32 tics, boolean fromDamage); void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fromDamage);