From 9cb6ae647ca99349243ccd787fd3c36bbc1d3dc5 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 11 Apr 2024 20:29:45 +0100
Subject: [PATCH 1/3] Numlaps is a cheat, remove from gameplay options per
 discussion

---
 src/k_menu.h                   | 1 -
 src/menus/options-gameplay-1.c | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/k_menu.h b/src/k_menu.h
index c7c95be63..bedb924be 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -478,7 +478,6 @@ typedef enum
 {
 	gopt_spacer0 = 0,
 	gopt_gamespeed,
-	gopt_baselapcount,
 	gopt_frantic,
 	gopt_encore,
 	gopt_exitcountdown,
diff --git a/src/menus/options-gameplay-1.c b/src/menus/options-gameplay-1.c
index 96f992c0e..fc81174de 100644
--- a/src/menus/options-gameplay-1.c
+++ b/src/menus/options-gameplay-1.c
@@ -21,9 +21,6 @@ menuitem_t OPTIONS_Gameplay[] =
 	{IT_STRING | IT_CVAR, "Game Speed", "Gear for the next map.",
 		NULL, {.cvar = &cv_kartspeed}, 0, 0},
 
-	{IT_STRING | IT_CVAR, "Base Lap Count", "How many laps must be completed per race.",
-		NULL, {.cvar = &cv_numlaps}, 0, 0},
-
 	{IT_STRING | IT_CVAR, "Frantic Items", "Make item odds crazier with more powerful items!",
 		NULL, {.cvar = &cv_kartfrantic}, 0, 0},
 

From e569377ad312cf48f7bac353e308c06f5290d9b9 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 11 Apr 2024 20:34:56 +0100
Subject: [PATCH 2/3] Instead of ineffectually restricting karteliminatelast
 via console callback exclusively in release builds, just don't use the cvar's
 value if you can't K_CanChangeRules

---
 src/d_netcmd.c | 7 -------
 src/p_inter.c  | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 18239fccf..54de0adbe 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -7282,13 +7282,6 @@ void KartEncore_OnChange(void)
 void KartEliminateLast_OnChange(void);
 void KartEliminateLast_OnChange(void)
 {
-#ifndef DEVELOP
-	if (K_CanChangeRules(false) == false)
-	{
-		CV_StealthSet(&cv_karteliminatelast, cv_karteliminatelast.defaultvalue);
-	}
-#endif
-
 	P_CheckRacers();
 }
 
diff --git a/src/p_inter.c b/src/p_inter.c
index 55ec1a6fc..dc51f2d84 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1525,7 +1525,7 @@ boolean P_CheckRacers(void)
 {
 	const boolean griefed = (spectateGriefed > 0);
 
-	boolean eliminateLast = cv_karteliminatelast.value;
+	boolean eliminateLast = (!K_CanChangeRules(true) || (cv_karteliminatelast.value != 0));
 	boolean allHumansDone = true;
 	//boolean allBotsDone = true;
 

From 72c770b0c07b2cb6b0b07e68df1b85ad9a664377 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 11 Apr 2024 20:36:09 +0100
Subject: [PATCH 3/3] K_StartingBumperCount: Stronger restriction against using
 cv_kartbumpers when you can't K_CanChangeRules

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

diff --git a/src/k_battle.c b/src/k_battle.c
index 05bc34b57..5e1b51a01 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -60,7 +60,7 @@ INT32 K_StartingBumperCount(void)
 	if (tutorialchallenge == TUTORIALSKIP_INPROGRESS)
 		return 0;
 
-	if (battleprisons || K_CheckBossIntro())
+	if (battleprisons || K_CheckBossIntro() || !K_CanChangeRules(true))
 	{
 		if (grandprixinfo.gp)
 		{