From 3983967449f167275962fabef1c27f3c569d80fd Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 16 Nov 2020 20:11:54 -0500
Subject: [PATCH] Scale tumble height with player speed, not just inflictor
 speed

---
 src/k_kart.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 52e8cdf79..cb9f564c9 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2581,8 +2581,8 @@ void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source)
 
 	if (inflictor && !P_MobjWasRemoved(inflictor))
 	{
-		const fixed_t infSpeed = P_AproxDistance(inflictor->momx, inflictor->momy) / 2;
-		player->tumbleHeight += (infSpeed / player->mo->scale);
+		const fixed_t addHeight = FixedHypot(FixedHypot(inflictor->momx, inflictor->momy) / 2, FixedHypot(player->mo->momx, player->mo->momy) / 2);
+		player->tumbleHeight += (addHeight / player->mo->scale);
 	}
 
 	player->mo->momz = player->tumbleHeight * player->mo->scale * P_MobjFlip(player->mo);