Merge branch 'fix-offroad' into 'next'

Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts

See merge request KartKrew/Kart-Public!62
This commit is contained in:
wolfs 2019-02-16 07:02:13 -05:00
commit 97aeb13db3
1 changed files with 1 additions and 1 deletions

View File

@ -4717,7 +4717,7 @@ static void K_KartDrift(player_t *player, boolean onground)
}
// Disable drift-sparks until you're going fast enough
if (player->kartstuff[k_getsparks] == 0 || player->kartstuff[k_offroad])
if (player->kartstuff[k_getsparks] == 0 || (player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer]))
driftadditive = 0;
if (player->speed > minspeed*2)
player->kartstuff[k_getsparks] = 1;