Merge branch 'flame-shield-slope-resistance' into 'master'

Slope resistance for flame shield

See merge request KartKrew/Kart!488
This commit is contained in:
Sal 2021-12-12 09:13:05 +00:00
commit f9abe3f2e4

View file

@ -2682,7 +2682,7 @@ boolean K_ApplyOffroad(player_t *player)
boolean K_SlopeResistance(player_t *player)
{
if (player->invincibilitytimer || player->sneakertimer || player->tiregrease)
if (player->invincibilitytimer || player->sneakertimer || player->tiregrease || player->flamedash)
return true;
return false;
}