diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 9c5689f03..3a8013c12 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -7067,7 +7067,7 @@ static void KartPurpleDrift_OnChange(void) return; } - if (!purpledriftactive && cv_kartpurpledrift.value) + if (!K_PurpleDriftActive() && cv_kartpurpledrift.value) { if (leveltime < starttime) { @@ -7079,7 +7079,7 @@ static void KartPurpleDrift_OnChange(void) CONS_Printf(M_GetText("4-tier drifting will be turned \"On\" Next Round.\n")); } } - else if (purpledriftactive && !cv_kartpurpledrift.value) + else if (K_PurpleDriftActive() && !cv_kartpurpledrift.value) { if (leveltime < starttime) { diff --git a/src/k_kart.c b/src/k_kart.c index 614f625dc..c1c7e1fd8 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4409,7 +4409,7 @@ UINT16 K_DriftSparkColor(player_t *player, INT32 charge) color = K_RainbowColor(leveltime); } } - else if (cv_kartpurpledrift.value && charge >= ds*3) + else if (K_PurpleDriftActive() && charge >= ds*3) { // Stage 3: Purple if (charge <= (ds*3)+(32*3)) @@ -4498,7 +4498,7 @@ static void K_SpawnDriftSparks(player_t *player) spark->color = 1 + (leveltime % (numskincolors-1)); } - else if (cv_kartpurpledrift.value && player->driftcharge >= K_GetKartDriftSparkValue(player)*3) + else if (K_PurpleDriftActive() && player->driftcharge >= K_GetKartDriftSparkValue(player)*3) { if (player->driftcharge <= (K_GetKartDriftSparkValue(player)*3)+(24*3)) spark->color = SKINCOLOR_VIOLET; // transition @@ -8916,7 +8916,7 @@ static void K_KartDrift(player_t *player, boolean onground) fixed_t driftadditive = 24; INT32 dsone = K_GetKartDriftSparkValue(player); INT32 dstwo = dsone*2; - INT32 dsthree = cv_kartpurpledrift.value ? dsone*3 : dsone*4; + INT32 dsthree = K_PurpleDriftActive() ? dsone*3 : dsone*4; INT32 dsfour = dsone*4; UINT16 buttons = K_GetKartButtons(player); diff --git a/src/p_setup.c b/src/p_setup.c index ed2f5e9dc..6300b68a2 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7891,7 +7891,7 @@ static void P_InitLevelSettings(boolean reloadinggamestate) if (cv_kartrings.value) ringsactive = true; - if (cv_kartslipdash.value) + if (cv_kartpurpledrift.value) purpledriftactive = true; if (cv_kartstacking.value)