From 6f6bc3333fa502a31faf2a4e28f690d891debb2a Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Tue, 23 Apr 2019 01:10:16 -0400
Subject: [PATCH] Put behind cvar

---
 src/d_netcmd.c | 1 +
 src/d_netcmd.h | 2 +-
 src/g_game.c   | 9 ++-------
 src/k_kart.c   | 7 ++++++-
 src/m_menu.c   | 3 +--
 src/y_inter.c  | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 49dfae28f..46a57b340 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -369,6 +369,7 @@ static CV_PossibleValue_t kartvoices_cons_t[] = {{0, "Never"}, {1, "Tasteful"},
 consvar_t cv_kartvoices = {"kartvoices", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_karteliminatelast = {"karteliminatelast", "Yes", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOSHOWHELP, CV_YesNo, KartEliminateLast_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartusepwrlv = {"kartusepwrlv", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t kartdebugitem_cons_t[] = {{-1, "MIN"}, {NUMKARTITEMS-1, "MAX"}, {0, NULL}};
 consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index efd314701..aa5f08b2b 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -120,8 +120,8 @@ extern consvar_t cv_kartencore;
 extern consvar_t cv_kartvoterulechanges;
 extern consvar_t cv_kartspeedometer;
 extern consvar_t cv_kartvoices;
-
 extern consvar_t cv_karteliminatelast;
+extern consvar_t cv_kartusepwrlv;
 
 extern consvar_t cv_votetime;
 
diff --git a/src/g_game.c b/src/g_game.c
index cd388b8bd..169933084 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2839,16 +2839,11 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
 	{
 		UINT8 i;
 		UINT8 pos = 0;
-		boolean usepowerlvl = false;
 
 		// SRB2Kart: figure out player spawn pos from points
 		if (!playeringame[playernum] || players[playernum].spectator)
 			return playerstarts[0]; // go to first spot if you're a spectator
 
-		// Setup power level type
-		if (netgame)
-			usepowerlvl = true;
-
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
 			if (!playeringame[i] || players[i].spectator)
@@ -2870,7 +2865,7 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
 					if (j == i)
 						continue;
 
-					if (usepowerlvl)
+					if (netgame && cv_kartusepwrlv.value)
 					{
 						if (clientpowerlevels[j][0] == clientpowerlevels[i][0])
 							num++;
@@ -2891,7 +2886,7 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
 					pos++;
 				else
 				{
-					if (usepowerlvl)
+					if (netgame && cv_kartusepwrlv.value)
 					{
 						if (clientpowerlevels[i][0] > clientpowerlevels[playernum][0])
 							pos++;
diff --git a/src/k_kart.c b/src/k_kart.c
index 2ec21d0f1..d07afda66 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -544,6 +544,7 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartspeedometer);
 	CV_RegisterVar(&cv_kartvoices);
 	CV_RegisterVar(&cv_karteliminatelast);
+	CV_RegisterVar(&cv_kartusepwrlv);
 	CV_RegisterVar(&cv_votetime);
 
 	CV_RegisterVar(&cv_kartdebugitem);
@@ -6122,6 +6123,10 @@ void K_PlayerForfeit(UINT8 playernum, boolean pointloss)
 	if (!netgame)
 		return;
 
+	// This server isn't using power levels anyway!
+	if (!cv_kartusepwrlv.value)
+		return;
+
 	// Hey, I just got here!
 	if (players[playernum].jointime <= 1)
 		return;
@@ -6144,7 +6149,7 @@ void K_PlayerForfeit(UINT8 playernum, boolean pointloss)
 	else if (G_BattleGametype())
 		powertype = 1;
 
-	if (powertype == -1) // Not using power levels?
+	if (powertype == -1) // No power type?!
 		return;
 
 	if (clientpowerlevels[playernum][powertype] == 0) // splitscreen guests don't record power level changes
diff --git a/src/m_menu.c b/src/m_menu.c
index d3541ebde..1d11a2805 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1445,8 +1445,7 @@ static menuitem_t OP_GameOptionsMenu[] =
 	{IT_STRING | IT_CVAR, NULL, "Starting Bumpers",				&cv_kartbumpers,		110},
 	{IT_STRING | IT_CVAR, NULL, "Karma Comeback",				&cv_kartcomeback,		120},
 
-	{IT_STRING | IT_CVAR, NULL, "Force Character",				&cv_forceskin,          140},
-	{IT_STRING | IT_CVAR, NULL, "Restrict Character Changes",	&cv_restrictskinchange, 150},
+	{IT_STRING | IT_CVAR, NULL, "Track Power Levels",			&cv_kartusepwrlv,		140},
 };
 
 static menuitem_t OP_ServerOptionsMenu[] =
diff --git a/src/y_inter.c b/src/y_inter.c
index ff99b7ff4..42a5b0921 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -937,7 +937,7 @@ void Y_StartIntermission(void)
 	// set player Power Level type
 	powertype = -1;
 
-	if (netgame)
+	if (netgame && cv_kartusepwrlv.value)
 	{
 		if (G_RaceGametype())
 			powertype = 0;