stjr
/
Kart-Public
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jug_nobumpcode' into 'next' 

Fix bumpcode, fix magnet landing (better fix)

See merge request KartKrew/Kart-Public!281
This commit is contained in:
toaster 2022-06-14 15:34:39 +00:00
parent 71de39bcbc 894c4cffc2
commit d49bd1474a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/k_kart.c
View File

@ -5947,7 +5947,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
}
if (onground)
// JugadorXEI: Do *not* calculate friction when a player is pogo'd
// because they'll be in the air and friction will not reset!
if (onground && !player->kartstuff[k_pogospring])
{
// Friction
if (!player->kartstuff[k_offroad])
@ -5981,11 +5983,11 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
// Wipeout slowdown
if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow])
if (player->speed > 0 && player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow])
{
if (player->kartstuff[k_offroad])
player->mo->friction -= 4912;
if (player->kartstuff[k_wipeoutslow] == 1 && player->kartstuff[k_pogospring] == 0)
if (player->kartstuff[k_wipeoutslow] == 1)
player->mo->friction -= 9824;
}
}