From fd8c1c866bf5015a353bc0f9fb5a3a2d47d63b69 Mon Sep 17 00:00:00 2001
From: NepDisk <16447892+NepDisk@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:07:34 -0400
Subject: [PATCH] Fix gamespeed for mine punt as well

---
 src/k_botitem.c |  2 --
 src/k_kart.c    | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/k_botitem.c b/src/k_botitem.c
index f9417200e..72bd490bb 100644
--- a/src/k_botitem.c
+++ b/src/k_botitem.c
@@ -187,8 +187,6 @@ static player_t *K_PlayerPredictThrow(player_t *player, UINT8 extra)
 			break;
 	}
 	
-	throwspeed = FixedMul(throwspeed, mapobjectscale);
-	
 	estx = player->mo->x + P_ReturnThrustX(NULL, player->mo->angle, (throwspeed + player->speed) * airtime);
 	
 	esty = player->mo->y + P_ReturnThrustY(NULL, player->mo->angle, (throwspeed + player->speed) * airtime);
diff --git a/src/k_kart.c b/src/k_kart.c
index f41a42a0d..6c65b9ea8 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -4372,7 +4372,18 @@ void K_PuntMine(mobj_t *origMine, mobj_t *punter)
 	if (mine->threshold > 0)
 		return;
 
-	spd = FixedMul(82 * punter->scale, K_GetKartGameSpeedScalar(gamespeed)); // Avg Speed is 41 in Normal
+	switch (gamespeed)
+	{
+		case 0:
+			spd = 68*mapobjectscale; // Avg Speed is 34
+			break;
+		case 2:
+			spd = 96*mapobjectscale; // Avg Speed is 48
+			break;
+		default:
+			spd = 82*mapobjectscale; // Avg Speed is 41
+			break;
+	}
 
 	mine->flags |= MF_NOCLIPTHING;