From f7b98451ad4df00de6b55da9424d946a8df9e49b Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Fri, 31 Oct 2025 02:05:45 -0400
Subject: [PATCH] Don't use Auto Gear in Match Race

---
 src/menus/transient/level-select.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/menus/transient/level-select.c b/src/menus/transient/level-select.c
index fee71b815..2b3a73ad0 100644
--- a/src/menus/transient/level-select.c
+++ b/src/menus/transient/level-select.c
@@ -664,7 +664,7 @@ void M_LevelSelectInit(INT32 choice)
 			{
 				CV_StealthSet(&cv_kartbot, cv_dummymatchbots.string);
 				CV_StealthSet(&cv_kartencore, (cv_dummygpencore.value == 1) ? "On" : "Auto");
-				CV_StealthSet(&cv_kartspeed, (cv_dummykartspeed.value == KARTSPEED_NORMAL) ? "Auto Gear" : cv_dummykartspeed.string);
+				CV_StealthSet(&cv_kartspeed, cv_dummykartspeed.string);
 			}
 
 			break;
@@ -832,9 +832,9 @@ void M_LevelSelected(INT16 add, boolean menuupdate)
 static void M_MenuQueueStopSend(INT32 ch)
 {
 	(void)ch;
-	
+
 	memset(&menuqueue, 0, sizeof(struct menuqueue));
-	
+
 	menuqueue.clearing = false;
 }
 
@@ -914,13 +914,13 @@ void M_CupQueueHandler(cupheader_t *cup)
 	UINT8 bonusmodulo = max(1, (cup->numlevels+1)/(cup->numbonus+1));
 	UINT16 cupLevelNum;
 	INT32 gtcheck;
-	
+
 	// We shouldn't get to this point while there's rounds queued, but if we do, get outta there.
 	if (roundqueue.size)
 	{
 		return;
 	}
-	
+
 	menuqueue.size = 0;
 
 	// Levels are added to the queue in the following pattern.
@@ -931,7 +931,7 @@ void M_CupQueueHandler(cupheader_t *cup)
 	while (levelindex < cup->numlevels)
 	{
 		memset(menuqueue.entries+menuqueue.size, 0, sizeof(roundentry_t));
-		
+
 		// Fill like two or three Race maps.
 		for (i = 0; i < bonusmodulo; i++)
 		{
@@ -942,7 +942,7 @@ void M_CupQueueHandler(cupheader_t *cup)
 				// Just skip the map if it's invalid.
 				continue;
 			}
-			
+
 			if ((mapheaderinfo[cupLevelNum]->typeoflevel & TOL_RACE) == TOL_RACE)
 			{
 				gtcheck = GT_RACE;
@@ -955,7 +955,7 @@ void M_CupQueueHandler(cupheader_t *cup)
 			menuqueue.entries[menuqueue.size].mapnum = cupLevelNum;
 			menuqueue.entries[menuqueue.size].gametype = gtcheck;
 			menuqueue.entries[menuqueue.size].encore = (cv_kartencore.value == 1);
-			
+
 			menuqueue.size++;
 
 			levelindex++;
@@ -984,7 +984,7 @@ void M_CupQueueHandler(cupheader_t *cup)
 				menuqueue.entries[menuqueue.size].mapnum = cupLevelNum;
 				menuqueue.entries[menuqueue.size].gametype = gtcheck;
 				menuqueue.entries[menuqueue.size].encore = (cv_kartencore.value == 1);
-				
+
 				menuqueue.size++;
 			}
 
@@ -1094,7 +1094,7 @@ static void M_MenuQueueResponse(INT32 ch)
 void M_LevelConfirmHandler(void)
 {
 	// Starting immediately OR importing queue
-	
+
 	while ((menuqueue.size + roundqueue.size) > ROUNDQUEUE_MAX)
 			menuqueue.size--;
 
@@ -1134,7 +1134,7 @@ static void M_ClearQueueResponse(INT32 ch)
 		return;
 
 	S_StartSound(NULL, sfx_slip);
-	
+
 	if (!netgame)
 		memset(&roundqueue, 0, sizeof(struct roundqueue));
 	if (netgame && (roundqueue.size != 0))
@@ -1297,7 +1297,7 @@ void M_LevelSelectTick(void)
 
 	if (!menuqueue.sending)
 		return;
-	
+
 	if ((menuqueue.sending <= menuqueue.size) // Sending
 		&& (roundqueue.size >= menuqueue.anchor)) // Didn't get it wiped
 	{