Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems

This commit is contained in:
toaster 2018-08-14 22:16:55 +01:00
commit 746c48af60

View file

@ -1564,7 +1564,7 @@ UINT16 K_GetKartFlashing(player_t *player)
UINT16 tics = flashingtics; UINT16 tics = flashingtics;
if (G_BattleGametype()) if (G_BattleGametype())
tics *= 2; tics *= 2;
tics += (flashingtics/6) * (player->kartspeed-5); // when weight is buffed in battle, use this instead: (player->kartspeed - player->kartweight) tics += (flashingtics/8) * (player->kartspeed);
return tics; return tics;
} }