From b97c6e34c269fffc2b7e0b902068674e8bb37c79 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 27 Apr 2024 23:46:30 -0700 Subject: [PATCH] Fix K_PlayerTripwireSpeedThreshold breakage --- src/k_kart.c | 8 ++++---- src/k_kart.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 126063d80..9eae4da16 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2982,10 +2982,10 @@ fixed_t K_PlayerTripwireSpeedThreshold(const player_t *player) // Make it harder for bots to do this when rubberbanding. // This is actually biased really hard against the bot, - // because the bot rubberbanding speed increase is + // because the bot rubberbanding speed increase isgit buil // decreased with other boosts. - required_speed = FixedMul(top_speed, player->botvars.rubberband); + required_speed = FixedMul(required_speed, player->botvars.rubberband); } return required_speed; @@ -3001,7 +3001,7 @@ tripwirepass_t K_TripwirePassConditions(const player_t *player) if ( player->flamedash || - (player->speed > K_PlayerTripwireSpeedThreshold(player)) && player->tripwireReboundDelay == 0) + ((player->speed > K_PlayerTripwireSpeedThreshold(player)) && player->tripwireReboundDelay == 0) ) return TRIPWIRE_BOOST; @@ -3075,7 +3075,7 @@ boolean K_WaterRun(mobj_t *mobj) return K_IsHoldingDownTop(mobj->player) == false; } - minspeed = K_PlayerTripwireSpeedThreshold(player); + minspeed = K_PlayerTripwireSpeedThreshold(mobj->player); if (mobj->player->speed < minspeed / 5) // 40% { diff --git a/src/k_kart.h b/src/k_kart.h index eec786f93..09c2d46d4 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -201,6 +201,7 @@ void K_StripOther(player_t *player); void K_MomentumToFacing(player_t *player); boolean K_ApplyOffroad(const player_t *player); boolean K_SlopeResistance(const player_t *player); +fixed_t K_PlayerTripwireSpeedThreshold(const player_t *player); tripwirepass_t K_TripwirePassConditions(const player_t *player); boolean K_TripwirePass(const player_t *player); boolean K_MovingHorizontally(mobj_t *mobj);