thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'flashingfoolishness' into 'master'

Browse source 
Flashingtics Foolishness

See merge request KartKrew/Kart!397
This commit is contained in:
Sal 2021-02-21 20:44:18 -05:00
commit 5d1ed4074c
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_kart.c
View file

@ -6213,15 +6213,13 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->karthud[khud_timeovercam] = 0;
// Specific hack because it insists on setting flashing tics during this anyway...
if (( player->kartstuff[k_spinouttype] & KSPIN_IFRAMES ) == 0)
{
player->powers[pw_flashing] = 0;
}
// Make ABSOLUTELY SURE that your flashing tics don't get set WHILE you're still in hit animations.
else if (player->kartstuff[k_spinouttimer] != 0 || player->kartstuff[k_wipeoutslow] != 0)
if (player->kartstuff[k_spinouttimer] != 0 || player->kartstuff[k_wipeoutslow] != 0)
{
player->powers[pw_flashing] = K_GetKartFlashing(player);
if (( player->kartstuff[k_spinouttype] & KSPIN_IFRAMES ) == 0)
player->powers[pw_flashing] = 0;
else
player->powers[pw_flashing] = K_GetKartFlashing(player);
}
if (player->kartstuff[k_spinouttimer])