From 59b2db31296c0647de6cfb084d8b6063b20f40ee Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Sat, 26 Aug 2023 22:58:18 -0700
Subject: [PATCH 1/2] Debugstart can now force POSITION on

---
 src/cvars.cpp | 2 +-
 src/k_kart.c  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cvars.cpp b/src/cvars.cpp
index 88d9c07ee..6f7e3e812 100644
--- a/src/cvars.cpp
+++ b/src/cvars.cpp
@@ -786,7 +786,7 @@ consvar_t cv_kartdebughuddrop = OnlineCheat("debugitemdrop", "Off").on_off().des
 extern CV_PossibleValue_t kartdebugitem_cons_t[];
 consvar_t cv_kartdebugitem = OnlineCheat("debugitem", "None").values(kartdebugitem_cons_t).description("Force item boxes to only roll one kind of item");
 
-consvar_t cv_kartdebugstart = OnlineCheat("debugstart", "Off").on_off().description("Skip POSITION");
+consvar_t cv_kartdebugstart = OnlineCheat("debugstart", "-1").min_max(-1, 16).description("Override playercount for POSITION time calcs. -1 default, 0 skip");
 consvar_t cv_kartdebugwaypoints = OnlineCheat("debugwaypoints", "Off").values({{0, "Off"}, {1, "Forwards"}, {2, "Backwards"}}).description("Make waypoints visible");
 
 #ifdef DEVELOP
diff --git a/src/k_kart.c b/src/k_kart.c
index 2e279c96e..0a02784e3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -228,6 +228,9 @@ void K_TimerInit(void)
 				numPlayers++;
 			}
 
+			if (cv_kartdebugstart.value > 0)
+				numPlayers = cv_kartdebugstart.value;
+
 			if (numPlayers < 2)
 			{
 				domodeattack = true;
@@ -256,7 +259,7 @@ void K_TimerInit(void)
 		}
 	}
 
-	if (cv_kartdebugstart.value || M_NotFreePlay() == false)
+	if (cv_kartdebugstart.value == 0 || M_NotFreePlay() == false)
 	{
 		starttime = 0;
 		introtime = 0;

From 7d9a40fc3876a8c48012cb7204aa9f0fd737e6de Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 27 Aug 2023 03:34:34 -0700
Subject: [PATCH 2/2] K_TimerInit: actually let debugstart force POSITION on,
 even in Free Play

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 0a02784e3..70b0424ac 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -259,7 +259,7 @@ void K_TimerInit(void)
 		}
 	}
 
-	if (cv_kartdebugstart.value == 0 || M_NotFreePlay() == false)
+	if (cv_kartdebugstart.value == -1 ? M_NotFreePlay() == false : cv_kartdebugstart.value == 0)
 	{
 		starttime = 0;
 		introtime = 0;