diff --git a/src/k_kart.c b/src/k_kart.c index dd191442a..31567ea1a 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10451,17 +10451,18 @@ static void K_KartSpindash(player_t *player) { if (player->pflags & PF_NOFASTFALL) return; - // Update fastfall. - player->fastfall = player->mo->momz; - player->spindash = 0; - P_ResetPitchRoll(player->mo); - if (player->fastfallBase == 0) + if (player->fastfall == 0) { // Factors 3D momentum. player->fastfallBase = FixedHypot(player->speed, player->mo->momz); } + // Update fastfall. + player->fastfall = player->mo->momz; + player->spindash = 0; + P_ResetPitchRoll(player->mo); + return; } else if (player->fastfall != 0) @@ -10589,7 +10590,6 @@ boolean K_FastFallBounce(player_t *player) player->mo->momz = bounce * P_MobjFlip(player->mo); player->fastfall = 0; - player->fastfallBase = 0; return true; } diff --git a/src/p_inter.c b/src/p_inter.c index e56e68400..5645ddbc2 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2583,7 +2583,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da player->driftboost = player->strongdriftboost = 0; player->gateBoost = 0; player->fastfall = 0; - player->fastfallBase = 0; player->ringboost = 0; player->glanceDir = 0; player->pflags &= ~PF_GAINAX; diff --git a/src/p_user.c b/src/p_user.c index d3fd068ba..49d858240 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -484,7 +484,6 @@ void P_ResetPlayer(player_t *player) player->trickpanel = 0; player->glanceDir = 0; player->fastfall = 0; - player->fastfallBase = 0; if (player->mo != NULL && P_MobjWasRemoved(player->mo) == false) {