thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-17 12:12:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-pvp-wipeout-friction' into 'master'

Browse source 
Fix wipeout friction for PvP damage

See merge request KartKrew/Kart!1107
This commit is contained in:
James R 2023-03-28 09:41:28 +00:00
commit bda765f61e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/k_kart.c
View file

@ -776,9 +776,14 @@ static void K_PlayerJustBumped(player_t *player)
player->justbumped = bumptime;
player->spindash = 0;
// If spinouttimer is not set yet but could be set later,
// this lets the bump still trigger wipeout friction. If
// spinouttimer never gets set, then this has no effect on
// friction and gets unset anyway.
player->wipeoutslow = wipeoutslowtime+1;
if (player->spinouttimer)
{
player->wipeoutslow = wipeoutslowtime+1;
player->spinouttimer = max(wipeoutslowtime+1, player->spinouttimer);
//player->spinouttype = KSPIN_WIPEOUT; // Enforce type
}