From 6932a52463a2ca7fa0646c70bf4a1ad1d8bd8f56 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 8 Feb 2025 15:36:33 +0100 Subject: [PATCH] change speelines blending condition uuuhh, so, if you have sneakerboost they always will apply additive blending otherwise if you go really fast (faster than sneakerboost) --- src/k_kart.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 67199bf93..3a5e6fdb8 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5397,6 +5397,25 @@ void K_KartPlayerHUDUpdate(player_t *player) player->kartstuff[k_cardanimation] = 0; } +static boolean K_SpeedLinesShouldBlend(player_t *player) +{ + fixed_t percentspeed = 0; + + if (!player->mo) + return false; + + if (player->kartstuff[k_sneakertimer]) + return true; + + // this is how the percentage speedometer calcs, i suck at maths so this was the easiest thing to fo lmao + percentspeed = (FixedDiv(player->speed, FixedMul(K_GetKartSpeed(player, false), ORIG_FRICTION))*100)>>FRACBITS; + + if (percentspeed > 127) // sneaker boost is around 25% + return true; + + return false; +} + typedef INT32 (*randomFunc)(INT32 min, INT32 max); static inline void K_SpawnNormalSpeedLines(player_t *player, boolean synched) @@ -5418,7 +5437,7 @@ static inline void K_SpawnNormalSpeedLines(player_t *player, boolean synched) if (cv_coloredspeedlines.value) { - const boolean goodSpeed = (player->speed >= (3*K_GetKartSpeed(player, false))/4); + const boolean colorSpeed = (player->speed >= (3*K_GetKartSpeed(player, false))/4); if (player->kartstuff[k_eggmanexplode]) { @@ -5431,7 +5450,7 @@ static inline void K_SpawnNormalSpeedLines(player_t *player, boolean synched) fast->color = player->mo->color; fast->colorized = true; } - else if (goodSpeed) + else if (colorSpeed) { UINT8 driftcolor = SKINCOLOR_NONE; @@ -5450,7 +5469,7 @@ static inline void K_SpawnNormalSpeedLines(player_t *player, boolean synched) fast->frame |= FF_ADD; } - if (goodSpeed && ((player->kartstuff[k_growshrinktimer] > 0) || player->kartstuff[k_invincibilitytimer] || player->kartstuff[k_sneakertimer])) + if (colorSpeed && K_SpeedLinesShouldBlend(player)) fast->blendmode = AST_ADD; } }