From 224bd9baf307829345f7bdf64bc3a1d6fbab5036 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@tyronesama.moe>
Date: Sun, 2 Oct 2022 04:12:03 -0700
Subject: [PATCH] Don't DEVELOP guard spbtest

---
 src/d_netcmd.c    |  4 +---
 src/k_kart.c      |  5 +----
 src/objects/spb.c | 11 -----------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index de352ee81..ff5c9dd57 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -455,9 +455,7 @@ consvar_t cv_kartdebugcheckpoint = CVAR_INIT ("kartdebugcheckpoint", "Off", CV_C
 consvar_t cv_kartdebugnodes = CVAR_INIT ("kartdebugnodes", "Off", CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_kartdebugcolorize = CVAR_INIT ("kartdebugcolorize", "Off", CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_kartdebugdirector = CVAR_INIT ("kartdebugdirector", "Off", CV_CHEAT, CV_OnOff, NULL);
-#ifdef DEVELOP
-	consvar_t cv_spbtest = CVAR_INIT ("spbtest", "Off", CV_CHEAT, CV_OnOff, NULL);
-#endif
+consvar_t cv_spbtest = CVAR_INIT ("spbtest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
 
 static CV_PossibleValue_t votetime_cons_t[] = {{10, "MIN"}, {3600, "MAX"}, {0, NULL}};
 consvar_t cv_votetime = CVAR_INIT ("votetime", "20", CV_NETVAR, votetime_cons_t, NULL);
diff --git a/src/k_kart.c b/src/k_kart.c
index ee49a676c..7aba7398c 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -267,10 +267,7 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartdebugnodes);
 	CV_RegisterVar(&cv_kartdebugcolorize);
 	CV_RegisterVar(&cv_kartdebugdirector);
-
-	#ifdef DEVELOP
-		CV_RegisterVar(&cv_spbtest);
-	#endif
+	CV_RegisterVar(&cv_spbtest);
 }
 
 //}
diff --git a/src/objects/spb.c b/src/objects/spb.c
index c38c6b9d1..32cb0e12d 100644
--- a/src/objects/spb.c
+++ b/src/objects/spb.c
@@ -105,11 +105,7 @@ static void SPBMantaRings(mobj_t *spb)
 		Obj_MantaRingCreate(
 			spb,
 			spb_owner(spb),
-#ifdef DEVELOP
 			cv_spbtest.value ? NULL : spb_chase(spb)
-#else
-			spb_chase(spb)
-#endif
 		);
 	}
 }
@@ -358,11 +354,7 @@ static void SPBSeek(mobj_t *spb, player_t *bestPlayer)
 			spb->fuse = 2*TICRATE;
 		}
 	}
-#ifdef DEVELOP
 	else if (!cv_spbtest.value)
-#else
-	else
-#endif
 	{
 		if (dist <= activeDist)
 		{
@@ -441,7 +433,6 @@ static void SPBSeek(mobj_t *spb, player_t *bestPlayer)
 
 				if (pathfindsuccess == true)
 				{
-#ifdef DEVELOP
 					if (cv_spbtest.value) {
 						if (pathtoplayer.numnodes > 1)
 						{
@@ -461,7 +452,6 @@ static void SPBSeek(mobj_t *spb, player_t *bestPlayer)
 						}
 					}
 					else
-#else
 					{
 						path_t reversepath = {0};
 						boolean reversesuccess = false;
@@ -502,7 +492,6 @@ static void SPBSeek(mobj_t *spb, player_t *bestPlayer)
 							Z_Free(reversepath.array);
 						}
 					}
-#endif
 					Z_Free(pathtoplayer.array);
 				}
 			}