From f891535065deb1b68a9dd34d4da7f3021fcaa6df Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Oct 2022 17:44:07 -0700
Subject: [PATCH] Remove kartdebugcheckpoint, merge into debugwaypoints

---
 src/d_netcmd.c |  1 -
 src/d_netcmd.h |  2 +-
 src/k_hud.c    | 25 +++++++++++--------------
 src/k_kart.c   |  1 -
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 678b36fc7..3473432e5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -446,7 +446,6 @@ static CV_PossibleValue_t kartdebugwaypoint_cons_t[] = {{0, "Off"}, {1, "Forward
 consvar_t cv_kartdebugwaypoints = CVAR_INIT ("debugwaypoints", "Off", CV_NETVAR|CV_CHEAT, kartdebugwaypoint_cons_t, NULL);
 consvar_t cv_kartdebugbotpredict = CVAR_INIT ("debugbotpredict", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 
-consvar_t cv_kartdebugcheckpoint = CVAR_INIT ("kartdebugcheckpoint", "Off", CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_kartdebugnodes = CVAR_INIT ("debugnodes", "Off", CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_kartdebugcolorize = CVAR_INIT ("debugcolorize", "Off", CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_kartdebugdirector = CVAR_INIT ("debugdirector", "Off", CV_CHEAT, CV_OnOff, NULL);
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index f045b1121..7fb6c4c53 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -120,7 +120,7 @@ extern consvar_t cv_kartusepwrlv;
 extern consvar_t cv_votetime;
 
 extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugdistribution, cv_kartdebughuddrop;
-extern consvar_t cv_kartdebugcheckpoint, cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector;
+extern consvar_t cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector;
 extern consvar_t cv_kartdebugwaypoints, cv_kartdebugbotpredict;
 
 extern consvar_t cv_itemfinder;
diff --git a/src/k_hud.c b/src/k_hud.c
index 474661a7f..72816abb1 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -4554,23 +4554,23 @@ static void K_drawDistributionDebugger(void)
 	V_DrawString(0, 0, V_SNAPTOTOP, va("USEODDS %d", useodds));
 }
 
-static void K_drawCheckpointDebugger(void)
+static void K_DrawWaypointDebugger(void)
 {
+	if (cv_kartdebugwaypoints.value == 0)
+		return;
+
 	if (stplyr != &players[displayplayers[0]]) // only for p1
 		return;
 
-	if (stplyr->starpostnum == numstarposts)
-		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts));
-	else
-		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d", stplyr->starpostnum, numstarposts));
-}
+	V_DrawString(8, 166, 0, va("'Best' Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint)));
+	V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish));
 
-static void K_DrawWaypointDebugger(void)
-{
-	if ((cv_kartdebugwaypoints.value != 0) && (stplyr == &players[displayplayers[0]]))
+	if (numstarposts > 0)
 	{
-		V_DrawString(8, 166, 0, va("'Best' Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint)));
-		V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish));
+		if (stplyr->starpostnum == numstarposts)
+			V_DrawString(8, 186, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts));
+		else
+			V_DrawString(8, 186, 0, va("Checkpoint: %d / %d", stplyr->starpostnum, numstarposts));
 	}
 }
 
@@ -4785,9 +4785,6 @@ void K_drawKartHUD(void)
 	if (cv_kartdebugdistribution.value)
 		K_drawDistributionDebugger();
 
-	if (cv_kartdebugcheckpoint.value)
-		K_drawCheckpointDebugger();
-
 	if (cv_kartdebugnodes.value)
 	{
 		UINT8 p;
diff --git a/src/k_kart.c b/src/k_kart.c
index ad7818bf9..7978c97fc 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -260,7 +260,6 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartdebugwaypoints);
 	CV_RegisterVar(&cv_kartdebugbotpredict);
 
-	CV_RegisterVar(&cv_kartdebugcheckpoint);
 	CV_RegisterVar(&cv_kartdebugnodes);
 	CV_RegisterVar(&cv_kartdebugcolorize);
 	CV_RegisterVar(&cv_kartdebugdirector);