From 894c4cffc242f674728703c640a0876739491508 Mon Sep 17 00:00:00 2001 From: JugadorXEI Date: Wed, 1 Jun 2022 17:47:09 +0200 Subject: [PATCH] no more bumpcode, no more magnet landing (again) --- src/k_kart.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index a326eea6..334e5e59 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5946,7 +5946,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]) @@ -5980,11 +5982,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; } }