From eef1e986a6574b499e359b439dac843d7c599539 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 25 May 2024 15:28:41 +0200 Subject: [PATCH] add proper check to sparkle lol --- src/k_kart.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index e1ecb0d50..8c727fdd3 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3501,19 +3501,24 @@ void K_DriftDustHandling(mobj_t *spawner) K_MatchGenericExtraFlags(dust, spawner); - if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*4) - dust->color = 1 + (leveltime % (MAXSKINCOLORS-1)); - else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*2) + if (!P_MobjWasRemoved(spawner) && spawner->player && spawner->player->mo) { - if (spawner->player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(spawner->player)*2)+(24*3)) - dust->color = SKINCOLOR_RASPBERRY; // transition - else - dust->color = SKINCOLOR_KETCHUP; + if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*4) + dust->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); + else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*2) + { + if (spawner->player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(spawner->player)*2)+(24*3)) + dust->color = SKINCOLOR_RASPBERRY; // transition + else + dust->color = SKINCOLOR_KETCHUP; + } + else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)) + dust->color = SKINCOLOR_SAPPHIRE; + else + dust->color = SKINCOLOR_SILVER; } - else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)) - dust->color = SKINCOLOR_SAPPHIRE; else - dust->color = spawner->player->skincolor; + dust->color = SKINCOLOR_SILVER; } }