From 78c0926e202d069212ef51ed922ba507ce96aea4 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 27 Mar 2023 04:58:45 -0700 Subject: [PATCH] Always set wipeoutslow when bouncing This fixes PvP wipeout damage not getting wipeout friction because of the order of operations: K_KartBouncing first, then K_SpinPlayer. --- src/k_kart.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index b9baa2d2c..a97c53cae 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -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 }