From 1b30b072cdaaec373500444f404317dd68b90982 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 15 Apr 2018 12:10:22 -0500
Subject: [PATCH 01/42] mint-arena: Move FIGHT message to match VQ3 in
 non-splitscreen

---
 code/cgame/cg_servercmds.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 0de688a95..8aa1f4ddf 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -580,7 +580,11 @@ static void CG_MapRestart( void ) {
 	// play the "fight" sound if this is a restart without warmup
 	if ( cg.warmup == 0 /* && cgs.gametype == GT_TOURNAMENT */) {
 		trap_S_StartLocalSound( cgs.media.countFightSound, CHAN_ANNOUNCER );
-		CG_GlobalCenterPrint( "FIGHT!", SCREEN_HEIGHT/2, 2.0 );
+		if ( CG_NumLocalPlayers() > 1 ) {
+			CG_GlobalCenterPrint( "FIGHT!", SCREEN_HEIGHT/2, 2.0 );
+		} else {
+			CG_GlobalCenterPrint( "FIGHT!", 112 + GIANTCHAR_HEIGHT/2, 2.0 );
+		}
 	}
 #ifdef MISSIONPACK
 	if (cg_singlePlayer.integer) {

From ada730875bcdd1283130910839b6c831745411c7 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 21 Apr 2018 12:37:19 -0500
Subject: [PATCH 02/42] mint-arena: Initialize botimport.MilliSeconds

I added it for sharing code with BSPC but I forgot to initialize it in
the Game VM.
---
 code/game/ai_chat_sys.c | 12 ++++++------
 code/game/g_botlib.c    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/game/ai_chat_sys.c b/code/game/ai_chat_sys.c
index 89601cceb..7bf7fa4e2 100644
--- a/code/game/ai_chat_sys.c
+++ b/code/game/ai_chat_sys.c
@@ -1051,7 +1051,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
 	bot_randomstring_t *randomstring;
 
 #ifdef DEBUG
-	int starttime = Sys_MilliSeconds();
+	int starttime = botimport.MilliSeconds();
 #endif //DEBUG
 
 	if ( !*filename )
@@ -1138,7 +1138,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
 	BotAI_Print(PRT_DEVELOPER, "loaded %s\n", filename);
 	//
 #ifdef DEBUG
-	BotAI_Print(PRT_DEVELOPER, "random strings %d msec\n", Sys_MilliSeconds() - starttime);
+	BotAI_Print(PRT_DEVELOPER, "random strings %d msec\n", botimport.MilliSeconds() - starttime);
 	//BotDumpRandomStringList(randomlist);
 #endif //DEBUG
 	//
@@ -2174,7 +2174,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
 #ifdef DEBUG
 	int starttime;
 
-	starttime = Sys_MilliSeconds();
+	starttime = botimport.MilliSeconds();
 #endif //DEBUG
 	//
 	size = 0;
@@ -2322,7 +2322,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
 		BotCheckInitialChatIntegrety(chat);
 	} //end if
 #ifdef DEBUG
-	BotAI_Print(PRT_DEVELOPER, "initial chats loaded in %d msec\n", Sys_MilliSeconds() - starttime);
+	BotAI_Print(PRT_DEVELOPER, "initial chats loaded in %d msec\n", botimport.MilliSeconds() - starttime);
 #endif //DEBUG
 	//character was read successfully
 	return chat;
@@ -3098,7 +3098,7 @@ void BotFreeChatState(int handle)
 int BotSetupChatAI(void)
 {
 #ifdef DEBUG
-	int starttime = Sys_MilliSeconds();
+	int starttime = botimport.MilliSeconds();
 #endif //DEBUG
 
 	synonyms = BotLoadSynonyms("syn.c");
@@ -3113,7 +3113,7 @@ int BotSetupChatAI(void)
 	InitConsoleMessageHeap();
 
 #ifdef DEBUG
-	BotAI_Print(PRT_MESSAGE, "setup chat AI %d msec\n", Sys_MilliSeconds() - starttime);
+	BotAI_Print(PRT_MESSAGE, "setup chat AI %d msec\n", botimport.MilliSeconds() - starttime);
 #endif //DEBUG
 	return BLERR_NOERROR;
 } //end of the function BotSetupChatAI
diff --git a/code/game/g_botlib.c b/code/game/g_botlib.c
index 0b385c611..f665c3565 100644
--- a/code/game/g_botlib.c
+++ b/code/game/g_botlib.c
@@ -108,6 +108,7 @@ G_BotInitBotLib
 void G_BotInitBotLib(void) {
 	botlib_import_t	botlib_import;
 
+	botlib_import.MilliSeconds = trap_Milliseconds;
 	botlib_import.Print = BotAI_Print;
 	botlib_import.Trace = BotAI_Trace;
 	botlib_import.EntityTrace = BotAI_EntityTrace;

From 824a1f6fc0f2c7d70fab7e4a8c681cb575ab0ab2 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 3 May 2018 21:18:07 -0500
Subject: [PATCH 03/42] mint-arena: Fix unable to type in console when missing
 missionpack menus

If using missionpack UI code but missing menu scripts the console will
be drawn fullscreen. However it was not possible to type in the console.
---
 code/cgame/cg_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index cffb81427..d2e121957 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -3100,6 +3100,9 @@ void CG_DistributeKeyEvent( int key, qboolean down, unsigned time, connstate_t s
 		CG_KeyEvent( key, down );
 	} else if ( keyCatcher & KEYCATCH_UI ) {
 		UI_KeyEvent( key, down );
+	} else if ( state == CA_DISCONNECTED ) {
+		// console is drawn if disconnected and not KEYCATCH_UI
+		Console_Key( key, down );
 	}
 }
 
@@ -3126,6 +3129,9 @@ void CG_DistributeCharEvent( int character, connstate_t state ) {
 		CG_KeyEvent( key, qtrue );
 	} else if ( keyCatcher & KEYCATCH_UI ) {
 		UI_KeyEvent( key, qtrue );
+	} else if ( state == CA_DISCONNECTED ) {
+		// console is drawn if disconnected and not KEYCATCH_UI
+		Console_Key( key, qtrue );
 	}
 }
 

From f8f504ba1973d0dfac23414fe008a2da04302ded Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 3 May 2018 21:27:55 -0500
Subject: [PATCH 04/42] mint-arena: Clear screen before drawing dedicated
 console

The console shader may be transparent causing past frame buffer to be
seen / lower performance.
---
 code/cgame/cg_console.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/cgame/cg_console.c b/code/cgame/cg_console.c
index c751ded24..78013c5e8 100644
--- a/code/cgame/cg_console.c
+++ b/code/cgame/cg_console.c
@@ -393,6 +393,7 @@ void Con_DrawConsole( connstate_t state ) {
 	// if disconnected, render console full screen
 	if ( state == CA_DISCONNECTED ) {
 		if ( !( Key_GetCatcher() & KEYCATCH_UI ) ) {
+			CG_ClearViewport();
 			Con_DrawSolidConsole( state, 1.0f );
 			return;
 		}

From a702b0395e8f62a7ba1c657e8140d5fbe424bbf8 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 6 May 2018 02:11:06 -0500
Subject: [PATCH 05/42] mint-arena: Add random bot to Team Arena UI + correct
 list in Game VM

Add "Random Bot" to Team Arena start server and ingame addbot menus to
execute command "addbot random".

Team Arena's addbot menu only allows adding characters from teaminfo.txt
in g_gametypes >= GT_TEAM, so use them for random bot selection for
"addbot random" and "bot_minplayers".
---
 code/game/g_bot.c | 175 ++++++++++++++++++++++++++++++++++++++++++----
 code/ui/ui_main.c |  84 +++++++++++++++-------
 2 files changed, 220 insertions(+), 39 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index 61c4e85de..fbf6bf548 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -36,6 +36,11 @@ Suite 120, Rockville, Maryland 20850 USA.
 static int		g_numBots;
 static char		*g_botInfos[MAX_BOTS];
 
+#ifdef MISSIONPACK
+static int		g_numTeamBots;
+static char		*g_teamBotInfos[MAX_BOTS];
+#endif
+
 
 int				g_numArenas;
 static char		*g_arenaInfos[MAX_ARENAS];
@@ -268,23 +273,36 @@ G_SelectRandomBotInfo
 Get random least used bot info on team or whole server if team is -1.
 ===============
 */
-int G_SelectRandomBotInfo( int team ) {
+char *G_SelectRandomBotInfo( int team ) {
 	int		selection[MAX_BOTS];
 	int		n, num;
 	int		count, bestCount;
 	char	*value;
+	int		numBots;
+	char	**botInfos;
+
+#ifdef MISSIONPACK
+	if ( g_gametype.integer >= GT_TEAM ) {
+		numBots = g_numTeamBots;
+		botInfos = g_teamBotInfos;
+	} else
+#endif
+	{
+		numBots = g_numBots;
+		botInfos = g_botInfos;
+	}
 
 	// don't add duplicate bots to the server if there are less bots than bot types
-	if ( team != -1 && G_CountBotPlayersByName( NULL, -1 ) < g_numBots ) {
+	if ( team != -1 && G_CountBotPlayersByName( NULL, -1 ) < numBots ) {
 		team = -1;
 	}
 
 	num = 0;
 	bestCount = MAX_CLIENTS;
-	for ( n = 0; n < g_numBots ; n++ ) {
-		value = Info_ValueForKey( g_botInfos[n], "funname" );
+	for ( n = 0; n < numBots ; n++ ) {
+		value = Info_ValueForKey( botInfos[n], "funname" );
 		if ( !value[0] ) {
-			value = Info_ValueForKey( g_botInfos[n], "name" );
+			value = Info_ValueForKey( botInfos[n], "name" );
 		}
 		//
 		count = G_CountBotPlayersByName( value, team );
@@ -305,10 +323,10 @@ int G_SelectRandomBotInfo( int team ) {
 
 	if ( num > 0 ) {
 		num = random() * ( num - 1 );
-		return selection[num];
+		return botInfos[selection[num]];
 	}
 
-	return -1;
+	return NULL;
 }
 
 /*
@@ -607,7 +625,6 @@ static void G_AddBot( const char *name, float skill, const char *team, int delay
 	int				connectionNum;
 	int				playerNum;
 	int				teamNum;
-	int				botinfoNum;
 	char			*botinfo;
 	char			*key;
 	char			*s;
@@ -659,15 +676,13 @@ static void G_AddBot( const char *name, float skill, const char *team, int delay
 			teamNum = TEAM_FREE;
 		}
 
-		botinfoNum = G_SelectRandomBotInfo( teamNum );
+		botinfo = G_SelectRandomBotInfo( teamNum );
 
-		if ( botinfoNum < 0 ) {
+		if ( !botinfo ) {
 			G_Printf( S_COLOR_RED "Error: Cannot add random bot, no bot info available.\n" );
 			trap_BotFreeClient( playerNum );
 			return;
 		}
-
-		botinfo = G_GetBotInfoByNumber( botinfoNum );
 	}
 	else {
 		botinfo = G_GetBotInfoByName( name );
@@ -1026,6 +1041,139 @@ char *G_GetBotInfoByName( const char *name ) {
 	return NULL;
 }
 
+#ifdef MISSIONPACK
+/*
+===============
+Character_Parse
+===============
+*/
+static qboolean Character_Parse(char **p, const char *filename) {
+	char *token;
+	char name[MAX_NAME_LENGTH];
+
+	token = COM_ParseExt(p, qtrue);
+
+	if ( token[0] != '{' ) {
+		return qfalse;
+	}
+
+	while ( 1 ) {
+		token = COM_ParseExt(p, qtrue);
+
+		if (Q_stricmp(token, "}") == 0) {
+			return qtrue;
+		}
+
+		if (!token[0]) {
+			return qfalse;
+		}
+
+		if (token[0] == '{') {
+			// two tokens per line, character name and sex
+			token = COM_ParseExt(p, qtrue);
+			if ( !token[0] ) {
+				return qfalse;
+			}
+			Q_strncpyz( name, token, sizeof( name ) );
+
+			token = COM_ParseExt(p, qtrue);
+			if ( !token[0] ) {
+				return qfalse;
+			}
+
+			if ( g_numTeamBots < ARRAY_LEN( g_teamBotInfos ) ) {
+				g_teamBotInfos[g_numTeamBots] = G_GetBotInfoByName( name );
+				if ( g_teamBotInfos[g_numTeamBots] ) {
+					g_numTeamBots++;
+				} else {
+					G_Printf( S_COLOR_YELLOW "WARNING: No bot defined in bots.txt for character '%s' in %s.\n", name, filename );
+				}
+			}
+
+			token = COM_ParseExt(p, qtrue);
+			if (token[0] != '}') {
+				return qfalse;
+			}
+		}
+	}
+
+	return qfalse;
+}
+
+/*
+===============
+G_ParseTeamInfo
+
+Team Arena's addbot menu only allows adding characters from teaminfo.txt
+in g_gametypes >= GT_TEAM, so use them for random bot selection too.
+===============
+*/
+static void G_ParseTeamInfo( const char *filename ) {
+	int				len;
+	fileHandle_t	f;
+	char			buf[MAX_BOTS_TEXT];
+	char			*p, *token;
+
+	g_numTeamBots = 0;
+
+	if ( g_gametype.integer < GT_TEAM ) {
+		return;
+	}
+
+	len = trap_FS_FOpenFile( filename, &f, FS_READ );
+	if ( !f ) {
+		trap_Print( va( S_COLOR_RED "file not found: %s\n", filename ) );
+		return;
+	}
+	if ( len >= MAX_BOTS_TEXT ) {
+		trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_BOTS_TEXT ) );
+		trap_FS_FCloseFile( f );
+		return;
+	}
+
+	trap_FS_Read( buf, len, f );
+	buf[len] = 0;
+	trap_FS_FCloseFile( f );
+
+	p = buf;
+
+	while ( 1 ) {
+		token = COM_ParseExt( &p, qtrue );
+		if(!token[0] || token[0] == '}') {
+			break;
+		}
+
+		if ( Q_stricmp( token, "}" ) == 0 ) {
+			break;
+		}
+
+		if (Q_stricmp(token, "teams") == 0) {
+			if (SkipBracedSection(&p, 0)) {
+				continue;
+			} else {
+				break;
+			}
+		}
+
+		if (Q_stricmp(token, "characters") == 0) {
+			if (Character_Parse(&p, filename)) {
+				continue;
+			} else {
+				break;
+			}
+		}
+
+		if (Q_stricmp(token, "aliases") == 0) {
+			if (SkipBracedSection(&p, 0)) {
+				continue;
+			} else {
+				break;
+			}
+		}
+	}
+}
+#endif
+
 /*
 ===============
 G_InitBots
@@ -1042,6 +1190,9 @@ void G_InitBots( qboolean restart ) {
 
 	G_LoadBots();
 	G_LoadArenas();
+#ifdef MISSIONPACK
+	G_ParseTeamInfo( "teaminfo.txt" );
+#endif
 
 	trap_Cvar_Register( &bot_minplayers, "bot_minplayers", "0", CVAR_SERVERINFO );
 
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index 15d2339c8..b7907877b 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -904,15 +904,18 @@ static void UI_DrawTeamName(rectDef_t *rect, float scale, vec4_t color, qboolean
 static void UI_DrawTeamMember(rectDef_t *rect, float scale, vec4_t color, qboolean blue, int num, int textStyle) {
 	// 0 - None
 	// 1 - Human
-	// 2..NumCharacters - Bot
+	// 2 - Random Bot
+	// 3..NumCharacters - Bot
 	int value = trap_Cvar_VariableValue(va(blue ? "ui_blueteam%i" : "ui_redteam%i", num));
 	const char *text;
 	if (value <= 0) {
 		text = "Closed";
 	} else if (value == 1) {
 		text = "Human";
+	} else if (value == 2) {
+		text = "Random Bot";
 	} else {
-		value -= 2;
+		value -= 3;
 
 		if (ui_actualNetGameType.integer >= GT_TEAM) {
 			if (value >= uiInfo.characterCount) {
@@ -1431,19 +1434,17 @@ static int UI_OwnerDrawWidth(int ownerDraw, float scale) {
 }
 
 static void UI_DrawBotName(rectDef_t *rect, float scale, vec4_t color, int textStyle) {
+	// 0 - Random Bot
+	// 1..NumCharacters - Bot
 	int value = uiInfo.botIndex;
 	int game = trap_Cvar_VariableValue("g_gametype");
 	const char *text = "";
-	if (game >= GT_TEAM) {
-		if (value >= uiInfo.characterCount) {
-			value = 0;
-		}
-		text = uiInfo.characterList[value].name;
+	if (value == 0) {
+		text = "Random Bot";
+	} else if (game >= GT_TEAM) {
+		text = uiInfo.characterList[value-1].name;
 	} else {
-		if (value >= UI_GetNumBots()) {
-			value = 0;
-		}
-		text = UI_GetBotNameByNumber(value);
+		text = UI_GetBotNameByNumber(value-1);
 	}
   UI_Text_Paint(rect->x, rect->y, scale, color, text, 0, 0, textStyle);
 }
@@ -2100,23 +2101,24 @@ static qboolean UI_TeamMember_HandleKey(int flags, float *special, int key, qboo
 	if (select != 0) {
 		// 0 - None
 		// 1 - Human
-		// 2..NumCharacters - Bot
+		// 2 - Random Bot
+		// 3..NumCharacters - Bot
 		char *cvar = va(blue ? "ui_blueteam%i" : "ui_redteam%i", num);
 		int value = trap_Cvar_VariableValue(cvar);
 
 		value += select;
 
 		if (ui_actualNetGameType.integer >= GT_TEAM) {
-			if (value >= uiInfo.characterCount + 2) {
+			if (value >= uiInfo.characterCount + 3) {
 				value = 0;
 			} else if (value < 0) {
-				value = uiInfo.characterCount + 2 - 1;
+				value = uiInfo.characterCount + 3 - 1;
 			}
 		} else {
-			if (value >= UI_GetNumBots() + 2) {
+			if (value >= UI_GetNumBots() + 3) {
 				value = 0;
 			} else if (value < 0) {
-				value = UI_GetNumBots() + 2 - 1;
+				value = UI_GetNumBots() + 3 - 1;
 			}
 		}
 
@@ -2194,22 +2196,24 @@ static qboolean UI_OpponentName_HandleKey(int flags, float *special, int key) {
 static qboolean UI_BotName_HandleKey(int flags, float *special, int key) {
 	int select = UI_SelectForKey(key);
 	if (select != 0) {
+		// 0 - Random Bot
+		// 1..NumCharacters - Bot
 		int game = trap_Cvar_VariableValue("g_gametype");
 		int value = uiInfo.botIndex;
 
 		value += select;
 
 		if (game >= GT_TEAM) {
-			if (value >= uiInfo.characterCount + 2) {
+			if (value >= uiInfo.characterCount + 1) {
 				value = 0;
 			} else if (value < 0) {
-				value = uiInfo.characterCount + 2 - 1;
+				value = uiInfo.characterCount + 1 - 1;
 			}
 		} else {
-			if (value >= UI_GetNumBots() + 2) {
+			if (value >= UI_GetNumBots() + 1) {
 				value = 0;
 			} else if (value < 0) {
-				value = UI_GetNumBots() + 2 - 1;
+				value = UI_GetNumBots() + 1 - 1;
 			}
 		}
 		uiInfo.botIndex = value;
@@ -2859,21 +2863,41 @@ static void UI_RunMenuScript(char **args) {
 			trap_Cvar_SetValue("sv_maxClients", clients);
 
 			for (i = 0; i < PLAYERS_PER_TEAM; i++) {
+				// 0 - None
+				// 1 - Human
+				// 2 - Random Bot
+				// 3..NumCharacters - Bot
 				int bot = trap_Cvar_VariableValue( va("ui_blueteam%i", i+1));
 				if (bot > 1) {
+					if (bot == 2) {
+						name = "random";
+					} else if (ui_actualNetGameType.integer >= GT_TEAM) {
+						name = uiInfo.characterList[bot-3].name;
+					} else {
+						name = UI_GetBotNameByNumber(bot-3);
+					}
+
 					if (ui_actualNetGameType.integer >= GT_TEAM) {
-						Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Blue");
+						Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", name, skill, "Blue");
 					} else {
-						Com_sprintf( buff, sizeof(buff), "addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
+						Com_sprintf( buff, sizeof(buff), "addbot %s %f\n", name, skill);
 					}
 					trap_Cmd_ExecuteText( EXEC_APPEND, buff );
 				}
 				bot = trap_Cvar_VariableValue( va("ui_redteam%i", i+1));
 				if (bot > 1) {
+					if (bot == 2) {
+						name = "random";
+					} else if (ui_actualNetGameType.integer >= GT_TEAM) {
+						name = uiInfo.characterList[bot-3].name;
+					} else {
+						name = UI_GetBotNameByNumber(bot-3);
+					}
+
 					if (ui_actualNetGameType.integer >= GT_TEAM) {
-						Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Red");
+						Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", name, skill, "Red");
 					} else {
-						Com_sprintf( buff, sizeof(buff), "addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
+						Com_sprintf( buff, sizeof(buff), "addbot %s %f\n", name, skill);
 					}
 					trap_Cmd_ExecuteText( EXEC_APPEND, buff );
 				}
@@ -3031,11 +3055,17 @@ static void UI_RunMenuScript(char **args) {
 				trap_Cmd_ExecuteText( EXEC_APPEND, va("callteamvote leader %s\n",uiInfo.teamPlayerNames[uiInfo.teamIndex]) );
 			}
 		} else if (Q_stricmp(name, "addBot") == 0) {
-			if (trap_Cvar_VariableValue("g_gametype") >= GT_TEAM) {
-				trap_Cmd_ExecuteText( EXEC_APPEND, va("addbot %s %i %s\n", uiInfo.characterList[uiInfo.botIndex].name, uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "Red" : "Blue") );
+			// 0 - Random Bot
+			// 1..NumCharacters - Bot
+			if (uiInfo.botIndex == 0) {
+				name = "random";
+			} else if (trap_Cvar_VariableValue("g_gametype") >= GT_TEAM) {
+				name = uiInfo.characterList[uiInfo.botIndex-1].name;
 			} else {
-				trap_Cmd_ExecuteText( EXEC_APPEND, va("addbot %s %i %s\n", UI_GetBotNameByNumber(uiInfo.botIndex), uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "Red" : "Blue") );
+				name = UI_GetBotNameByNumber(uiInfo.botIndex-1);
 			}
+
+			trap_Cmd_ExecuteText( EXEC_APPEND, va("addbot %s %i %s\n", name, uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "red" : "blue") );
 		} else if (Q_stricmp(name, "addFavorite") == 0) {
 			if (ui_netSource.integer != UIAS_FAVORITES) {
 				char name[MAX_NAME_LENGTH];

From bfc2c1c372280ec80b074f45013c8579ad3c73df Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 10 May 2018 04:55:27 -0500
Subject: [PATCH 06/42] mint-arena: Update version to 0.6 for IDEs

Missed updating version in bg_public.h at the same time as Makefile.
---
 code/game/bg_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index 1f7b4ed90..edd482275 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -44,7 +44,7 @@ Suite 120, Rockville, Maryland 20850 USA.
 
 // Keep this in-sync with VERSION in Makefile.
 #ifndef PRODUCT_VERSION
-	#define PRODUCT_VERSION			"0.5"
+	#define PRODUCT_VERSION			"0.6"
 #endif
 
 // because games can change separately from the main system protocol, we need a

From 860f759f62d9c06b9169b38ca1411525fef263c5 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 12 May 2018 03:06:53 -0500
Subject: [PATCH 07/42] mint-arena: Fix spectator list and UI_NOSCALE pixel
 boundary alignment

Fixes for "mint-arena: Don't align text in motion to pixel boundary"
commit cf45c8700c54dc4c50fd690e04b96c429797cc5f (Sep 16 2017).

Fix CGame scrolling spectator list to actually disable text alignment.
Fix UI_INMOTION being applied to UI_NOSCALE text.
---
 code/cgame/cg_newdraw.c | 2 +-
 code/game/bg_public.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c
index bde4f2576..82989cab9 100644
--- a/code/cgame/cg_newdraw.c
+++ b/code/cgame/cg_newdraw.c
@@ -110,7 +110,7 @@ void CG_Text_PaintInMotion(float x, float y, float scale, const vec4_t color, co
 		shadowOffset = 0;
 	}
 
-	Text_Paint( x, y, CG_FontForScale( scale ), scale, color, text, adjust, limit, shadowOffset, 0, qfalse, qfalse );
+	Text_Paint( x, y, CG_FontForScale( scale ), scale, color, text, adjust, limit, shadowOffset, 0, qfalse, qtrue );
 }
 
 void CG_Text_Paint_Limit(float *maxX, float x, float y, float scale, const vec4_t color, const char* text, float adjust, int limit) {
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index edd482275..7f6df5767 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -1199,7 +1199,7 @@ void	SnapVectorTowards( vec3_t v, vec3_t to );
 #define UI_FORCECOLOR	0x00010000
 #define UI_GRADIENT		0x00020000
 #define UI_NOSCALE		0x00040000 // fixed size with other UI elements, don't change it's scale
-#define UI_INMOTION		0x00040000 // use for scrolling / moving text to fix uneven scrolling caused by aligning to pixel boundary
+#define UI_INMOTION		0x00080000 // use for scrolling / moving text to fix uneven scrolling caused by aligning to pixel boundary
 
 
 typedef struct

From 7f33cddac3826de6c63cbf3a62a5b79eac88ac0d Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 21 Apr 2018 14:07:22 -0500
Subject: [PATCH 08/42] Fix possible bot goal state NULL pointer dereference

---
 code/game/ai_goal.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/game/ai_goal.c b/code/game/ai_goal.c
index 5e993d67b..0c3a8996f 100644
--- a/code/game/ai_goal.c
+++ b/code/game/ai_goal.c
@@ -198,6 +198,9 @@ void BotInterbreedGoalFuzzyLogic(int parent1, int parent2, int child)
 	p2 = BotGoalStateFromHandle(parent2);
 	c = BotGoalStateFromHandle(child);
 
+	if (!p1 || !p2 || !c)
+		return;
+
 	InterbreedWeightConfigs(p1->itemweightconfig, p2->itemweightconfig,
 									c->itemweightconfig);
 } //end of the function BotInterbreedingGoalFuzzyLogic
@@ -212,7 +215,7 @@ void BotSaveGoalFuzzyLogic(int goalstate, char *filename)
 	//bot_goalstate_t *gs;
 
 	//gs = BotGoalStateFromHandle(goalstate);
-
+	//if (!gs) return;
 	//WriteWeightConfig(filename, gs->itemweightconfig);
 } //end of the function BotSaveGoalFuzzyLogic
 //===========================================================================
@@ -226,7 +229,7 @@ void BotMutateGoalFuzzyLogic(int goalstate, float range)
 	bot_goalstate_t *gs;
 
 	gs = BotGoalStateFromHandle(goalstate);
-
+	if (!gs) return;
 	EvolveWeightConfig(gs->itemweightconfig);
 } //end of the function BotMutateGoalFuzzyLogic
 //===========================================================================

From 8967cfff539a7ed9ef276e31a063216443376156 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 21 Apr 2018 14:39:18 -0500
Subject: [PATCH 09/42] Fix uninitialized bot_goal_t fields

---
 code/game/ai_goal.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/game/ai_goal.c b/code/game/ai_goal.c
index 0c3a8996f..ccaf83d9f 100644
--- a/code/game/ai_goal.c
+++ b/code/game/ai_goal.c
@@ -862,6 +862,7 @@ int BotGetLevelItemGoal(int index, char *name, bot_goal_t *goal)
 			goal->number = li->number;
 			goal->flags = GFL_ITEM;
 			if (li->timeout) goal->flags |= GFL_DROPPED;
+			goal->iteminfo = li->iteminfo;
 			//BotAI_Print(PRT_MESSAGE, "found li %s\n", itemconfig->iteminfo[li->iteminfo].name);
 			return li->number;
 		} //end if
@@ -891,6 +892,9 @@ int BotGetMapLocationGoal(char *name, bot_goal_t *goal)
 			goal->entitynum = 0;
 			VectorCopy(mins, goal->mins);
 			VectorCopy(maxs, goal->maxs);
+			goal->number = 0;
+			goal->flags = 0;
+			goal->iteminfo = 0;
 			return qtrue;
 		} //end if
 	} //end for
@@ -919,6 +923,9 @@ int BotGetNextCampSpotGoal(int num, bot_goal_t *goal)
 			goal->entitynum = 0;
 			VectorCopy(mins, goal->mins);
 			VectorCopy(maxs, goal->maxs);
+			goal->number = 0;
+			goal->flags = 0;
+			goal->iteminfo = 0;
 			return num+1;
 		} //end if
 	} //end for

From 144dc866980ff91b8459af5940403cc8a6490da9 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 22 Apr 2018 17:56:43 -0500
Subject: [PATCH 10/42] Make UI_DrawProportionalString handle NULL string

This makes the function consistent with UI_DrawString.
---
 code/q3_ui/ui_atoms.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/q3_ui/ui_atoms.c b/code/q3_ui/ui_atoms.c
index 0d8735674..1fc46a69e 100644
--- a/code/q3_ui/ui_atoms.c
+++ b/code/q3_ui/ui_atoms.c
@@ -455,6 +455,10 @@ void UI_DrawProportionalString( int x, int y, const char* str, int style, vec4_t
 	float	propScale;
 	float	scale;
 
+	if( !str ) {
+		return;
+	}
+
 	propScale = UI_ProportionalSizeScale( style );
 
 	charh = propScale * PROP_HEIGHT;

From c4bb37cfd2a6e42f0cea06f025a4a57e1379cea5 Mon Sep 17 00:00:00 2001
From: IR4T4 <gutzu@gmx.ch>
Date: Thu, 26 Apr 2018 17:52:44 +0200
Subject: [PATCH 11/42] Fix array index in CanDamage() function - discovered by
 MARTY

The wrong array element was accessed. However the correct element is the
same value so fixing it does not affect gameplay.
---
 code/game/g_combat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/g_combat.c b/code/game/g_combat.c
index 7ca887848..96fe9b8bf 100644
--- a/code/game/g_combat.c
+++ b/code/game/g_combat.c
@@ -1226,7 +1226,7 @@ qboolean CanDamage (gentity_t *targ, vec3_t origin) {
 
 	VectorCopy(midpoint, dest);
 	dest[0] += offsetmins[0];
-	dest[1] += offsetmins[2];
+	dest[1] += offsetmins[1];
 	dest[2] += offsetmins[2];
 	trap_Trace(&tr, origin, vec3_origin, vec3_origin, dest, ENTITYNUM_NONE, MASK_SOLID);
 

From 85905ce9c1436249dedd940cffee652c09cd10f4 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 26 Apr 2018 11:40:16 -0500
Subject: [PATCH 12/42] Fix clearing keys for control in Team Arena UI

When a control is selected for binding a key, pressing backspace would
clear the displayed keys in the menu but not actually unbind the keys.
---
 code/ui/ui_shared.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
index 29c197fca..8454a94ae 100644
--- a/code/ui/ui_shared.c
+++ b/code/ui/ui_shared.c
@@ -3563,8 +3563,14 @@ qboolean Item_Bind_HandleKey(itemDef_t *item, int key, qboolean down) {
 			case K_BACKSPACE:
 				id = BindingIDFromName(item->cvar);
 				if (id != -1) {
-					g_bindings[id].bind1 = -1;
-					g_bindings[id].bind2 = -1;
+					if( g_bindings[id].bind1 != -1 ) {
+						DC->setBinding( g_bindings[id].bind1, "" );
+						g_bindings[id].bind1 = -1;
+					}
+					if( g_bindings[id].bind2 != -1 ) {
+						DC->setBinding( g_bindings[id].bind2, "" );
+						g_bindings[id].bind2 = -1;
+					}
 				}
 				Controls_SetConfig(qtrue);
 				g_waitingForKey = qfalse;

From 68eb7b2e8b627808c29277fec1411acab5d22cdb Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 29 Apr 2018 14:28:28 -0500
Subject: [PATCH 13/42] Improvements for dedicated camera followers (team
 follow1/2)

Switching to dedicated camera follower with no possible players to
follow would spawn at the intermission point and display "connection
interrupted" HUD message. Pmove() was not run for the client so
ps.commandTime was too far behind. I made it so that dedicated camera
followers and scoreboard run Pmove() but cannot move (PM_FREEZE).

When all players possible to follow leave, the dedicated camera follower
would continue to display the old player state of the player they were
following (along with "connection interrupted" HUD message). Unlike the
regular case of a spectator following a specific player, dedicated
camera followers did not reset their player state to the intermission
point after the followed player was no longer valid.

Now a client can be set as 'team follow1' to automatically switch
between displaying the intermission point and following a player when
possible.
---
 code/game/g_active.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/code/game/g_active.c b/code/game/g_active.c
index 69632220b..e2c329172 100644
--- a/code/game/g_active.c
+++ b/code/game/g_active.c
@@ -328,11 +328,15 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
 
 	player = ent->player;
 
-	if ( player->sess.spectatorState != SPECTATOR_FOLLOW ) {
-		if ( player->noclip ) {
-			player->ps.pm_type = PM_NOCLIP;
+	if ( player->sess.spectatorState != SPECTATOR_FOLLOW || !( player->ps.pm_flags & PMF_FOLLOW ) ) {
+		if ( player->sess.spectatorState == SPECTATOR_FREE ) {
+			if ( player->noclip ) {
+				player->ps.pm_type = PM_NOCLIP;
+			} else {
+				player->ps.pm_type = PM_SPECTATOR;
+			}
 		} else {
-			player->ps.pm_type = PM_SPECTATOR;
+			player->ps.pm_type = PM_FREEZE;
 		}
 		player->ps.speed = 400;	// faster than normal
 
@@ -1061,14 +1065,17 @@ void SpectatorPlayerEndFrame( gentity_t *ent ) {
 				ent->player->ps.pm_flags |= PMF_FOLLOW;
 				ent->player->ps.eFlags = flags;
 				return;
-			} else {
-				// drop them to free spectators unless they are dedicated camera followers
-				if ( ent->player->sess.spectatorPlayer >= 0 ) {
-					ent->player->sess.spectatorState = SPECTATOR_FREE;
-					PlayerBegin( ent->player - level.players );
-				}
 			}
 		}
+
+		if ( ent->player->ps.pm_flags & PMF_FOLLOW ) {
+			// drop them to free spectators unless they are dedicated camera followers
+			if ( ent->player->sess.spectatorPlayer >= 0 ) {
+				ent->player->sess.spectatorState = SPECTATOR_FREE;
+			}
+
+			PlayerBegin( ent->player - level.players );
+		}
 	}
 
 	if ( ent->player->sess.spectatorState == SPECTATOR_SCOREBOARD ) {

From 128d2edf307a70ec7a0fa577dba6a216a730153a Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 12 May 2018 14:09:02 -0500
Subject: [PATCH 14/42] mint-arena: Don't compile all files with Altivec

Compiling with -maltivec may generate code in VM dylibs on that will
crash on non-altivec PowerPC.
---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4e9f39fa8..9c336a1d8 100644
--- a/Makefile
+++ b/Makefile
@@ -228,11 +228,11 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
     HAVE_VM_COMPILED=true
   else
   ifeq ($(ARCH),ppc)
-    BASE_CFLAGS += -maltivec
+    ALTIVEC_CFLAGS = -maltivec
     HAVE_VM_COMPILED=true
   endif
   ifeq ($(ARCH),ppc64)
-    BASE_CFLAGS += -maltivec
+    ALTIVEC_CFLAGS = -maltivec
     HAVE_VM_COMPILED=true
   endif
   ifeq ($(ARCH),sparc)
@@ -294,10 +294,12 @@ ifeq ($(PLATFORM),darwin)
                  -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED)
 
   ifeq ($(ARCH),ppc)
-    BASE_CFLAGS += -arch ppc -faltivec
+    BASE_CFLAGS += -arch ppc
+    ALTIVEC_CFLAGS = -faltivec
   endif
   ifeq ($(ARCH),ppc64)
-    BASE_CFLAGS += -arch ppc64 -faltivec
+    BASE_CFLAGS += -arch ppc64
+    ALTIVEC_CFLAGS = -faltivec
   endif
   ifeq ($(ARCH),x86)
     OPTIMIZEVM += -march=prescott -mfpmath=sse
@@ -495,11 +497,11 @@ ifeq ($(PLATFORM),openbsd)
     HAVE_VM_COMPILED=true
   else
   ifeq ($(ARCH),ppc)
-    BASE_CFLAGS += -maltivec
+    ALTIVEC_CFLAGS = -maltivec
     HAVE_VM_COMPILED=true
   endif
   ifeq ($(ARCH),ppc64)
-    BASE_CFLAGS += -maltivec
+    ALTIVEC_CFLAGS = -maltivec
     HAVE_VM_COMPILED=true
   endif
   ifeq ($(ARCH),sparc64)

From 67a71c9ec2edcbc3895ec679d8b248001262290f Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 13 May 2018 22:37:45 -0500
Subject: [PATCH 15/42] mint-arena: Use function pointers in ui_shared.c
 instead of CG_

Make it easier to port to projects using separate CGame and UI VMs.
---
 code/cgame/cg_main.c | 3 +++
 code/ui/ui_main.c    | 3 +++
 code/ui/ui_shared.c  | 8 ++++----
 code/ui/ui_shared.h  | 3 +++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index d2e121957..da2e8bae5 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -2499,6 +2499,9 @@ void CG_LoadHudMenu( void ) {
 	cgDC.stopCinematic = &CG_StopCinematic;
 	cgDC.drawCinematic = &CG_DrawCinematic;
 	cgDC.runCinematicFrame = &CG_RunCinematicFrame;
+	cgDC.adjustFrom640 = &CG_AdjustFrom640;
+	cgDC.setScreenPlacement = &CG_SetScreenPlacement;
+	cgDC.popScreenPlacement = &CG_PopScreenPlacement;
 	
 	Init_Display(&cgDC);
 
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index b7907877b..032a788e4 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -4762,6 +4762,9 @@ void UI_Init( qboolean inGameLoad, int maxSplitView ) {
 	uiInfo.uiDC.stopCinematic = &UI_StopCinematic;
 	uiInfo.uiDC.drawCinematic = &UI_DrawCinematic;
 	uiInfo.uiDC.runCinematicFrame = &UI_RunCinematicFrame;
+	uiInfo.uiDC.adjustFrom640 = &CG_AdjustFrom640;
+	uiInfo.uiDC.setScreenPlacement = &CG_SetScreenPlacement;
+	uiInfo.uiDC.popScreenPlacement = &CG_PopScreenPlacement;
 
 	Init_Display(&uiInfo.uiDC);
 
diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
index 8454a94ae..202c879a3 100644
--- a/code/ui/ui_shared.c
+++ b/code/ui/ui_shared.c
@@ -3657,7 +3657,7 @@ void Item_Model_Paint(itemDef_t *item) {
 	w = item->window.rect.w-2;
 	h = item->window.rect.h-2;
 
-	CG_AdjustFrom640( &x, &y, &w, &h );
+	DC->adjustFrom640( &x, &y, &w, &h );
 
 	refdef.x = x;
 	refdef.y = y;
@@ -4343,7 +4343,7 @@ void Menu_Paint(menuDef_t *menu, qboolean forcePaint) {
 	}
 
 	if (menu->forceScreenPlacement) {
-		CG_SetScreenPlacement( menu->screenHPos, menu->screenVPos );
+		DC->setScreenPlacement( menu->screenHPos, menu->screenVPos );
 	}
 
 	// draw the background if necessary
@@ -4353,7 +4353,7 @@ void Menu_Paint(menuDef_t *menu, qboolean forcePaint) {
 		DC->drawHandlePic( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, menu->window.background );
 	} else if (menu->window.background) {
 		// this allows a background shader without being full screen
-		//CG_DrawPic(menu->window.rect.x, menu->window.rect.y, menu->window.rect.w, menu->window.rect.h, menu->backgroundShader);
+		//DC->drawHandlePic(menu->window.rect.x, menu->window.rect.y, menu->window.rect.w, menu->window.rect.h, menu->backgroundShader);
 	}
 
 	// paint the background and or border
@@ -4371,7 +4371,7 @@ void Menu_Paint(menuDef_t *menu, qboolean forcePaint) {
 	}
 
 	if (menu->forceScreenPlacement) {
-		CG_PopScreenPlacement();
+		DC->popScreenPlacement();
 	}
 }
 
diff --git a/code/ui/ui_shared.h b/code/ui/ui_shared.h
index 3ece3bc68..b83fbf3c4 100644
--- a/code/ui/ui_shared.h
+++ b/code/ui/ui_shared.h
@@ -381,6 +381,9 @@ typedef struct {
 	void (*stopCinematic)(int handle);
 	void (*drawCinematic)(int handle, float x, float y, float w, float h);
 	void (*runCinematicFrame)(int handle);
+	void (*adjustFrom640)( float *x, float *y, float *w, float *h );
+	void (*setScreenPlacement)( screenPlacement_e hpos, screenPlacement_e vpos );
+	void (*popScreenPlacement)( void );
 
   int				realTime;
   int				frameTime;

From b2efe17932e9752569ac73770ba35327ace66bf0 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 23 Jun 2018 07:55:29 -0500
Subject: [PATCH 16/42] mint-arena: Add capturelimit and g_instagib to callvote

---
 code/game/g_cmds.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index b25800129..329379def 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1410,9 +1410,11 @@ void Cmd_CallVote_f( gentity_t *ent ) {
 	} else if ( !Q_stricmp( arg1, "g_doWarmup" ) ) {
 	} else if ( !Q_stricmp( arg1, "timelimit" ) ) {
 	} else if ( !Q_stricmp( arg1, "fraglimit" ) ) {
+	} else if ( !Q_stricmp( arg1, "capturelimit" ) ) {
+	} else if ( !Q_stricmp( arg1, "g_instagib" ) ) {
 	} else {
 		trap_SendServerCommand( ent-g_entities, "print \"Invalid vote string.\n\"" );
-		trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, kicknum <playernum>, g_doWarmup, timelimit <time>, fraglimit <frags>.\n\"" );
+		trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, kicknum <playernum>, g_doWarmup <boolean>, timelimit <time>, fraglimit <frags>, capturelimit <captures>, g_instagib <boolean>.\n\"" );
 		return;
 	}
 

From 4a2d786e36192a34151ea7e314c1cf46a405be8c Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 23 Jun 2018 09:27:28 -0500
Subject: [PATCH 17/42] mint-arena: Add sanity checks for callvote arguments

Don't allow callvote with text or empty string for int arguments.
Don't allow negative or huge values for int arguments.
Make 'callvote map' check if map exists.
---
 code/game/g_cmds.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index 329379def..cff28c1c1 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1361,11 +1361,14 @@ void Cmd_Where_f( gentity_t *ent ) {
 Cmd_CallVote_f
 ==================
 */
+#define CALLVOTE_ARG2_NONE 1
+#define CALLVOTE_ARG2_INTREGAL 2
 void Cmd_CallVote_f( gentity_t *ent ) {
 	char*	c;
 	int		i;
 	char	arg1[MAX_STRING_TOKENS];
 	char	arg2[MAX_STRING_TOKENS];
+	int		arg2Flags, arg2RangeMin, arg2RangeMax;
 
 	if ( !g_allowVote.integer ) {
 		trap_SendServerCommand( ent-g_entities, "print \"Voting not allowed here.\n\"" );
@@ -1401,23 +1404,73 @@ void Cmd_CallVote_f( gentity_t *ent ) {
 		}
 	}
 
+	arg2Flags = 0;
+	arg2RangeMin = 0;
+	arg2RangeMax = INT_MAX;
+
 	if ( !Q_stricmp( arg1, "map_restart" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = 60; // max 1 minute
+
+		// default to 5 seconds if no argument was specified
+		if ( !arg2[0] ) {
+			Q_strncpyz( arg2, "5", sizeof( arg2 ) );
+		}
 	} else if ( !Q_stricmp( arg1, "nextmap" ) ) {
+		arg2Flags = CALLVOTE_ARG2_NONE;
 	} else if ( !Q_stricmp( arg1, "map" ) ) {
+		// string
 	} else if ( !Q_stricmp( arg1, "g_gametype" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = GT_MAX_GAME_TYPE - 1;
 	} else if ( !Q_stricmp( arg1, "kick" ) ) {
+		// string
 	} else if ( !Q_stricmp( arg1, "kicknum" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = MAX_CLIENTS;
 	} else if ( !Q_stricmp( arg1, "g_doWarmup" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = 1;
 	} else if ( !Q_stricmp( arg1, "timelimit" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = 240; // 4 hours
 	} else if ( !Q_stricmp( arg1, "fraglimit" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = 999;
 	} else if ( !Q_stricmp( arg1, "capturelimit" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = 999;
 	} else if ( !Q_stricmp( arg1, "g_instagib" ) ) {
+		arg2Flags = CALLVOTE_ARG2_INTREGAL;
+		arg2RangeMax = 1;
 	} else {
 		trap_SendServerCommand( ent-g_entities, "print \"Invalid vote string.\n\"" );
 		trap_SendServerCommand( ent-g_entities, "print \"Vote commands are: map_restart, nextmap, map <mapname>, g_gametype <n>, kick <player>, kicknum <playernum>, g_doWarmup <boolean>, timelimit <time>, fraglimit <frags>, capturelimit <captures>, g_instagib <boolean>.\n\"" );
 		return;
 	}
 
+	if ( ( arg2Flags & CALLVOTE_ARG2_NONE ) && arg2[0] != '\0' ) {
+		trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s does not accept an argument.\n\"", arg1 ) );
+		return;
+	}
+	else if ( arg2[0] == '\0' ) {
+		trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s requires an argument.\n\"", arg1 ) );
+		return;
+	}
+
+	if ( ( arg2Flags & CALLVOTE_ARG2_INTREGAL ) ) {
+		if ( !StringIsInteger( arg2 ) ) {
+			trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s argument must be a number.\n\"", arg1 ) );
+			return;
+		}
+
+		i = atoi( arg2 );
+		if ( i < arg2RangeMin || i > arg2RangeMax ) {
+			trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s argument must be %d to %d.\n\"", arg1, arg2RangeMin, arg2RangeMax ) );
+			return;
+		}
+	}
+
 	// if there is still a vote to be executed
 	if ( level.voteExecuteTime ) {
 		// don't start a vote when map change or restart is in progress
@@ -1445,6 +1498,17 @@ void Cmd_CallVote_f( gentity_t *ent ) {
 		// special case for map changes, we want to reset the nextmap setting
 		// this allows a player to change maps, but not upset the map rotation
 		char	s[MAX_STRING_CHARS];
+		char	filename[MAX_QPATH];
+
+		if ( strstr( arg2, ".." ) || strstr( arg2, "::" ) || strlen( arg2 ) + 9 >= MAX_QPATH ) {
+			trap_SendServerCommand( ent-g_entities, "print \"Invalid map name.\n\"" );
+			return;
+		}
+		Com_sprintf( filename, sizeof( filename ), "maps/%s.bsp", arg2 );
+		if ( trap_FS_FOpenFile( filename, NULL, FS_READ ) <= 0 ) {
+			trap_SendServerCommand( ent-g_entities, "print \"Map not found.\n\"" );
+			return;
+		}
 
 		trap_Cvar_VariableStringBuffer( "nextmap", s, sizeof(s) );
 		if (*s) {

From d3a427a96bf2e6ba33a1ff43b5e1157ddf7a7d12 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 23 Jun 2018 09:56:02 -0500
Subject: [PATCH 18/42] mint-arena: Reuse already calculated screen scale

---
 code/cgame/cg_view.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 71bc6dec6..11c001e91 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -256,16 +256,16 @@ void CG_CalcVrect (void) {
 	cgs.screenXScaleStretch = cg.viewportWidth * (1.0/640.0);
 	cgs.screenYScaleStretch = cg.viewportHeight * (1.0/480.0);
 	if ( cg.viewportWidth * 480 > cg.viewportHeight * 640 ) {
-		cgs.screenXScale = cg.viewportWidth * (1.0/640.0);
-		cgs.screenYScale = cg.viewportHeight * (1.0/480.0);
+		cgs.screenXScale = cgs.screenXScaleStretch;
+		cgs.screenYScale = cgs.screenYScaleStretch;
 		// wide screen
 		cgs.screenXBias = 0.5 * ( cg.viewportWidth - ( cg.viewportHeight * (640.0/480.0) ) );
 		cgs.screenXScale = cgs.screenYScale;
 		// no narrow screen
 		cgs.screenYBias = 0;
 	} else {
-		cgs.screenXScale = cg.viewportWidth * (1.0/640.0);
-		cgs.screenYScale = cg.viewportHeight * (1.0/480.0);
+		cgs.screenXScale = cgs.screenXScaleStretch;
+		cgs.screenYScale = cgs.screenYScaleStretch;
 		// narrow screen
 		cgs.screenYBias = 0.5 * ( cg.viewportHeight - ( cg.viewportWidth * (480.0/640.0) ) );
 		cgs.screenYScale = cgs.screenXScale;

From 74cffed53e88944a792a72f9c834c5dab73c0c49 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 24 Jun 2018 22:06:26 -0500
Subject: [PATCH 19/42] mint-arena: Add auto completion for testmodel and
 testgun

Completing filenames doesn't work for more than 2 directories deep.
This will be fixed in next Spearmint release.
---
 code/cgame/cg_consolecmds.c |  4 ++--
 code/cgame/cg_local.h       |  1 +
 code/cgame/cg_view.c        | 11 +++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 6ded1f55a..a04cd7463 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -951,8 +951,8 @@ void CG_ToggleMenu_f( void ) {
 static consoleCommand_t	cg_commands[] = {
 	{ "+vstr", CG_VstrDown_f, 0, CG_VstrComplete },
 	{ "-vstr", CG_VstrUp_f, 0, CG_VstrComplete },
-	{ "testgun", CG_TestGun_f, CMD_INGAME },
-	{ "testmodel", CG_TestModel_f, CMD_INGAME },
+	{ "testgun", CG_TestGun_f, CMD_INGAME, CG_TestModelComplete },
+	{ "testmodel", CG_TestModel_f, CMD_INGAME, CG_TestModelComplete },
 	{ "nextframe", CG_TestModelNextFrame_f, CMD_INGAME },
 	{ "prevframe", CG_TestModelPrevFrame_f, CMD_INGAME },
 	{ "nextskin", CG_TestModelNextSkin_f, CMD_INGAME },
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index af6b08534..a0836b071 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -1551,6 +1551,7 @@ void Key_SetCatcher( int catcher );
 // cg_view.c
 //
 void CG_TestModel_f (void);
+void CG_TestModelComplete( char *args, int argNum );
 void CG_TestGun_f (void);
 void CG_TestModelNextFrame_f (void);
 void CG_TestModelPrevFrame_f (void);
diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 11c001e91..c5b0bbb1a 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -107,6 +107,17 @@ void CG_TestModel_f (void) {
 	cg.testGun = qfalse;
 }
 
+/*
+=================
+CG_TestModelComplete
+=================
+*/
+void CG_TestModelComplete( char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		trap_Field_CompleteFilename( "", "$models", qfalse, qfalse );
+	}
+}
+
 /*
 =================
 CG_TestGun_f

From 6865a121b7b8fd29c32f9af79c8f096a3893af08 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sun, 24 Jun 2018 22:18:12 -0500
Subject: [PATCH 20/42] Make testgun command without argument disable test gun
 model

---
 code/cgame/cg_view.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index c5b0bbb1a..fd8eb6b28 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -79,6 +79,7 @@ can then be moved around
 void CG_TestModel_f (void) {
 	vec3_t		angles;
 
+	cg.testGun = qfalse;
 	memset( &cg.testModelEntity, 0, sizeof(cg.testModelEntity) );
 	if ( trap_Argc() < 2 ) {
 		return;
@@ -104,7 +105,6 @@ void CG_TestModel_f (void) {
 	angles[ROLL] = 0;
 
 	AnglesToAxis( angles, cg.testModelEntity.axis );
-	cg.testGun = qfalse;
 }
 
 /*
@@ -127,6 +127,11 @@ Replaces the current view weapon with the given model
 */
 void CG_TestGun_f (void) {
 	CG_TestModel_f();
+
+	if ( !cg.testModelEntity.hModel ) {
+		return;
+	}
+
 	cg.testGun = qtrue;
 	cg.testModelEntity.renderfx = RF_DEPTHHACK | RF_NO_MIRROR;
 }

From 5f04678ffeb910bc869aeb768cd14c1d9798d7f1 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 25 Jun 2018 19:33:10 -0500
Subject: [PATCH 21/42] mint-arena: Add auto completion for model and headmodel

---
 code/cgame/cg_consolecmds.c | 354 +++++++++++++++++++++++++++++++++++-
 1 file changed, 353 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index a04cd7463..86df2f5a6 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -239,6 +239,355 @@ void CG_SetModel_f( int localPlayerNum ) {
 	}
 }
 
+/*
+=============
+CG_SetHeadmodel_f
+=============
+*/
+void CG_SetHeadmodel_f( int localPlayerNum ) {
+	const char	*arg;
+	char	name[256];
+	char	cvarName[32];
+
+	Q_strncpyz( cvarName, Com_LocalPlayerCvarName( localPlayerNum, "headmodel"), sizeof (cvarName) );
+
+	arg = CG_Argv( 1 );
+	if ( arg[0] ) {
+		trap_Cvar_Set( cvarName, arg );
+	} else {
+		trap_Cvar_VariableStringBuffer( cvarName, name, sizeof(name) );
+		Com_Printf("%s is set to %s\n", cvarName, name);
+	}
+}
+
+/*
+=============
+CG_SetTeamModel_f
+=============
+*/
+void CG_SetTeamModel_f( int localPlayerNum ) {
+	const char	*arg;
+	char	name[256];
+	char	cvarName[32];
+
+	Q_strncpyz( cvarName, Com_LocalPlayerCvarName( localPlayerNum, "team_model"), sizeof (cvarName) );
+
+	arg = CG_Argv( 1 );
+	if ( arg[0] ) {
+		trap_Cvar_Set( cvarName, arg );
+		trap_Cvar_Set( Com_LocalPlayerCvarName( localPlayerNum, "team_headmodel"), arg );
+	} else {
+		trap_Cvar_VariableStringBuffer( cvarName, name, sizeof(name) );
+		Com_Printf("%s is set to %s\n", cvarName, name);
+	}
+}
+
+/*
+=============
+CG_SetTeamHeadmodel_f
+=============
+*/
+void CG_SetTeamHeadmodel_f( int localPlayerNum ) {
+	const char	*arg;
+	char	name[256];
+	char	cvarName[32];
+
+	Q_strncpyz( cvarName, Com_LocalPlayerCvarName( localPlayerNum, "team_headmodel"), sizeof (cvarName) );
+
+	arg = CG_Argv( 1 );
+	if ( arg[0] ) {
+		trap_Cvar_Set( cvarName, arg );
+	} else {
+		trap_Cvar_VariableStringBuffer( cvarName, name, sizeof(name) );
+		Com_Printf("%s is set to %s\n", cvarName, name);
+	}
+}
+
+/*
+=============
+CG_AddStringToList
+=============
+*/
+static void CG_AddStringToList( char *list, size_t listSize, int *listLength, char *name ) {
+	size_t namelen;
+	int val;
+	char *listptr;
+
+	namelen = strlen( name );
+
+	if ( *listLength + namelen + 1 >= listSize ) {
+		return;
+	}
+
+	for ( listptr = list; *listptr; listptr += strlen( listptr ) + 1 ) {
+		val = strcmp( name, listptr );
+		if ( val == 0 ) {
+			return;
+		}
+		// insert into list
+		else if ( val < 0 ) {
+			int moveBytes = *listLength - (int)( listptr - list ) + 1;
+
+			memmove( listptr + namelen + 1, listptr, moveBytes );
+			strncpy( listptr, name, namelen + 1 );
+			*listLength += namelen + 1;
+			return;
+		}
+	}
+
+	strncpy( listptr, name, namelen + 1 );
+	*listLength += namelen + 1;
+}
+
+/*
+==================
+CG_Field_CompletePlayerModel
+==================
+*/
+static void CG_Field_CompletePlayerModel( int argNum, qboolean lookingForHead, char *lookingForSkin, team_t lookingForTeam ) {
+	int		numdirs;
+	int		numfiles;
+	char	dirlist[2048];
+	char	filelist[2048];
+	char	skinname[MAX_QPATH];
+	int		skinnameLength;
+	char*	dirptr;
+	char*	fileptr;
+	char*	skinptr;
+	int		i;
+	int		j;
+	int		dirlen;
+	int		filelen;
+	char	list[8192];
+	int		listTotalLength;
+	char	completeModel[MAX_QPATH];
+	int		completeModelLength;
+	char	teamName[MAX_QPATH];
+	int		teamNameLength;
+	char	*skinPrefix;
+	int		skinPrefixLength;
+	char	*skinTeamSuffix;
+	int		skinTeamSuffixLength;
+
+	trap_Argv( argNum - 1, completeModel, sizeof( completeModel ) );
+
+	// remove skin
+	completeModelLength = 0;
+	while ( completeModel[completeModelLength] != '\0' && completeModel[completeModelLength] != '/' ) {
+		completeModelLength++;
+	}
+	completeModel[completeModelLength] = '\0';
+
+	teamName[0] = 0;
+#ifdef MISSIONPACK
+	if ( lookingForTeam != TEAM_FREE ) {
+		if ( lookingForTeam == TEAM_BLUE ) {
+			Q_strncpyz( teamName, cg_blueTeamName.string, sizeof( teamName ) );
+		} else {
+			Q_strncpyz( teamName, cg_redTeamName.string, sizeof( teamName ) );
+		}
+	}
+	if ( teamName[0] ) {
+		strcat( teamName, "/" );
+	}
+#endif
+	teamNameLength = strlen( teamName );
+
+	skinPrefix = ( lookingForHead ) ? "head_" : "upper_";
+	skinPrefixLength = ( lookingForHead ) ? 5 : 6;
+
+	skinTeamSuffix = ( lookingForTeam == TEAM_BLUE ) ? "_blue" : "_red";
+	skinTeamSuffixLength = ( lookingForTeam == TEAM_BLUE ) ? 5 : 6;
+
+	// ZTM: FIXME: have to clear whole list because CG_AddStringToList doesn't properly terminate list
+	memset( list, 0, sizeof( list ) );
+	listTotalLength = 0;
+
+	if ( !lookingForHead || completeModelLength == 0 || completeModel[0] != '*' ) {
+		// iterate directory of all player models
+		numdirs = trap_FS_GetFileList("models/players", "/", dirlist, 2048 );
+		dirptr  = dirlist;
+		for (i=0; i<numdirs; i++,dirptr+=dirlen+1)
+		{
+			dirlen = strlen(dirptr);
+
+			if ( dirlen == 0 )
+				continue;
+
+			if (dirptr[dirlen-1]=='/')
+				dirptr[dirlen-1]='\0';
+
+			if (!strcmp(dirptr,".") || !strcmp(dirptr,"..") || !strcmp(dirptr,"heads"))
+				continue;
+
+			// not a partial match
+			if ( completeModelLength > 0 && Q_stricmpn( completeModel, dirptr, completeModelLength ) != 0 ) {
+				continue;
+			}
+
+			// iterate all skin files in directory
+			numfiles = trap_FS_GetFileList( va("models/players/%s",dirptr), "skin", filelist, 2048 );
+			fileptr  = filelist;
+			for (j=0; j<numfiles;j++,fileptr+=filelen+1)
+			{
+				filelen = strlen(fileptr);
+				skinptr = fileptr;
+
+				// models/players/example/stroggs/upper_lily_red.skin
+				if ( teamNameLength > 0 && Q_stricmpn( skinptr, teamName, teamNameLength ) == 0 ) {
+					skinptr += teamNameLength;
+				}
+
+				// look for upper_???? or head_????
+				if ( Q_stricmpn( skinptr, skinPrefix, skinPrefixLength ) != 0 ) {
+					continue;
+				}
+
+				COM_StripExtension( skinptr + skinPrefixLength, skinname, sizeof( skinname ) );
+
+				if ( Q_stricmp( skinname, lookingForSkin ) == 0 ) {
+					// models/players/example/upper_default.skin
+					// add default skin as just the model name
+					// for team models this is red or blue
+					CG_AddStringToList( list, sizeof( list ), &listTotalLength, dirptr );
+				} else if ( lookingForTeam != TEAM_FREE ) {
+					// models/players/example/upper_lily_red.skin
+					// for team model add lily_red skin as lily
+					skinnameLength = strlen( skinname );
+
+					if ( skinnameLength - skinPrefixLength > skinTeamSuffixLength
+							&& COM_CompareExtension( skinname, skinTeamSuffix ) ) {
+						// remove _red
+						skinname[skinnameLength - 1 - skinTeamSuffixLength] = '\0';
+						CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "%s/%s", dirptr, skinname ) );
+					}
+				} else {
+					// models/players/example/upper_lily.skin
+					// misc ffa skins
+					CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "%s/%s", dirptr, skinname ) );
+				}
+			}
+		}
+	}
+
+	if ( lookingForHead && ( completeModelLength == 0 || completeModel[0] == '*' ) ) {
+		// iterate directory of all head models
+		numdirs = trap_FS_GetFileList("models/players/heads", "/", dirlist, 2048 );
+		dirptr  = dirlist;
+		for (i=0; i<numdirs; i++,dirptr+=dirlen+1)
+		{
+			dirlen = strlen(dirptr);
+
+			if ( dirlen == 0 )
+				continue;
+
+			if (dirptr[dirlen-1]=='/')
+				dirptr[dirlen-1]='\0';
+
+			if (!strcmp(dirptr,".") || !strcmp(dirptr,".."))
+				continue;
+
+			// not a partial match
+			// completeModel[0] is '*' which means heads directory
+			if ( completeModelLength > 1 && Q_stricmpn( completeModel+1, dirptr, completeModelLength-1 ) != 0 ) {
+				continue;
+			}
+
+			// iterate all skin files in directory
+			numfiles = trap_FS_GetFileList( va("models/players/heads/%s",dirptr), "skin", filelist, 2048 );
+			fileptr  = filelist;
+			for (j=0; j<numfiles;j++,fileptr+=filelen+1)
+			{
+				filelen = strlen(fileptr);
+				skinptr = fileptr;
+
+				// models/players/heads/example/stroggs/head_lily_red.skin
+				if ( teamNameLength > 0 && Q_stricmpn( skinptr, teamName, teamNameLength ) == 0 ) {
+					skinptr += teamNameLength;
+				}
+
+				// look for upper_???? or head_????
+				if ( Q_stricmpn( skinptr, skinPrefix, skinPrefixLength ) != 0 ) {
+					continue;
+				}
+
+				COM_StripExtension( skinptr + skinPrefixLength, skinname, sizeof( skinname ) );
+
+				if ( Q_stricmp( skinname, lookingForSkin ) == 0 ) {
+					// models/players/heads/example/head_default.skin
+					// add default skin as just the model name
+					// for team models this is red or blue
+					CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s", dirptr ) );
+				} else if ( lookingForTeam != TEAM_FREE ) {
+					// models/players/heads/example/head_lily_red.skin
+					// for team model add lily_red skin as lily
+					skinnameLength = strlen( skinname );
+
+					if ( skinnameLength - skinPrefixLength > skinTeamSuffixLength
+							&& COM_CompareExtension( skinname, skinTeamSuffix ) ) {
+						// remove _red
+						skinname[skinnameLength - 1 - skinTeamSuffixLength] = '\0';
+						CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s/%s", dirptr, skinname ) );
+					}
+				} else {
+					// models/players/heads/example/head_lily.skin
+					// misc ffa skins
+					CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s/%s", dirptr, skinname ) );
+				}
+			}
+		}
+	}
+
+	if ( listTotalLength > 0 ) {
+		list[listTotalLength++] = 0;
+		trap_Field_CompleteList( list );
+	}
+}
+
+/*
+==================
+CG_ModelComplete
+==================
+*/
+static void CG_ModelComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerModel( argNum, qfalse, "default", TEAM_FREE );
+	}
+}
+
+/*
+==================
+CG_HeadmodelComplete
+==================
+*/
+static void CG_HeadmodelComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerModel( argNum, qtrue, "default", TEAM_FREE );
+	}
+}
+
+/*
+==================
+CG_TeamModelComplete
+==================
+*/
+static void CG_TeamModelComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerModel( argNum, qfalse, "red", TEAM_RED );
+	}
+}
+
+/*
+==================
+CG_TeamHeadmodelComplete
+==================
+*/
+static void CG_TeamHeadmodelComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerModel( argNum, qtrue, "red", TEAM_RED );
+	}
+}
+
 #ifdef MISSIONPACK_HUD
 extern menuDef_t *menuScoreboard;
 extern displayContextDef_t cgDC;
@@ -1063,7 +1412,10 @@ static playerConsoleCommand_t	playerCommands[] = {
 	{ "-zoom", CG_ZoomUp_f, CMD_INGAME },
 	{ "centerecho", CG_CenterEcho_f, CMD_INGAME },
 	{ "centerview", IN_CenterView, 0 },
+	{ "headmodel", CG_SetHeadmodel_f, 0, CG_HeadmodelComplete },
 	{ "tcmd", CG_TargetCommand_f, CMD_INGAME },
+	{ "team_model", CG_SetTeamModel_f, 0, CG_TeamModelComplete },
+	{ "team_headmodel", CG_SetTeamHeadmodel_f, 0, CG_TeamHeadmodelComplete },
 	{ "tell_target", CG_TellTarget_f, CMD_INGAME },
 	{ "tell_attacker", CG_TellAttacker_f, CMD_INGAME },
 #ifdef MISSIONPACK
@@ -1093,7 +1445,7 @@ static playerConsoleCommand_t	playerCommands[] = {
 	{ "scoresDown", CG_ScrollScoresDown_f, CMD_INGAME },
 	{ "scoresUp", CG_ScrollScoresUp_f, CMD_INGAME },
 #endif
-	{ "model", CG_SetModel_f, 0 },
+	{ "model", CG_SetModel_f, 0, CG_ModelComplete },
 	{ "viewpos", CG_Viewpos_f, CMD_INGAME },
 	{ "weapnext", CG_NextWeapon_f, CMD_INGAME },
 	{ "weapprev", CG_PrevWeapon_f, CMD_INGAME },

From b356f4bd68f195d8b52f65d2e004e38f24b4cf54 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 25 Jun 2018 22:37:23 -0500
Subject: [PATCH 22/42] mint-arena: Add auto completion for game client command
 arguments

Add command argument completion for tell, vsay, vsay_team, vtell,
vtell_attacker, vtell_target, vosay, vosay_team, votell, give, follow,
team, callvote, vote, callteamvote, and teamvote.
---
 code/cgame/cg_consolecmds.c | 388 +++++++++++++++++++++++++++++++-----
 1 file changed, 336 insertions(+), 52 deletions(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 86df2f5a6..38ccb3986 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -320,7 +320,7 @@ static void CG_AddStringToList( char *list, size_t listSize, int *listLength, ch
 	}
 
 	for ( listptr = list; *listptr; listptr += strlen( listptr ) + 1 ) {
-		val = strcmp( name, listptr );
+		val = Q_stricmp( name, listptr );
 		if ( val == 0 ) {
 			return;
 		}
@@ -1297,6 +1297,304 @@ void CG_ToggleMenu_f( void ) {
 	CG_DistributeKeyEvent( K_ESCAPE, qfalse, trap_Milliseconds(), cg.connState, -1, 0 );
 }
 
+/*
+===================
+CG_ForwardToServer_f
+===================
+*/
+static void CG_ForwardToServer_f( int localPlayerNum ) {
+	char		buffer[BIG_INFO_STRING];
+
+	if ( cg.connected && trap_GetDemoState() != DS_PLAYBACK ) {
+		// the game server will interpret these commands
+		trap_LiteralArgs( buffer, sizeof ( buffer ) );
+		trap_SendClientCommand( buffer );
+	}
+}
+
+/*
+=================
+CG_Field_CompletePlayerName
+=================
+*/
+static void CG_Field_CompletePlayerName( int team, qboolean excludeTeam, qboolean excludeLocalPlayers ) {
+	int		i;
+	playerInfo_t	*pi;
+	char name[MAX_QPATH];
+	char list[MAX_CLIENTS * MAX_QPATH];
+	int listTotalLength;
+
+	if ( !cg.snap ) {
+		return;
+	}
+
+	// ZTM: FIXME: have to clear whole list because CG_AddStringToList doesn't properly terminate list
+	memset( list, 0, sizeof( list ) );
+	listTotalLength = 0;
+
+	for ( i = 0 ; i < cgs.maxplayers ; i++ ) {
+		pi = &cgs.playerinfo[ i ];
+		if ( !pi->infoValid ) {
+			continue;
+		}
+
+		if ( team != -1 && ( ( excludeTeam && pi->team == team ) || ( !excludeTeam && pi->team != team ) ) ) {
+			continue;
+		}
+
+		if ( excludeLocalPlayers && CG_LocalPlayerState( i ) ) {
+			continue;
+		}
+
+		Q_strncpyz( name, pi->name, sizeof ( name ) );
+		Q_CleanStr( name );
+
+		// Use quotes if there is a space in the name
+		if ( strchr( name, ' ' ) != NULL ) {
+			CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "\"%s\"", name ) );
+		} else {
+			CG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
+		}
+	}
+
+	if ( listTotalLength > 0 ) {
+		list[listTotalLength++] = 0;
+		trap_Field_CompleteList( list );
+	}
+}
+
+/*
+=================
+CG_TellComplete
+=================
+*/
+static void CG_TellComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerName( -1, qfalse, qfalse );
+	}
+}
+
+#ifdef MISSIONPACK
+/*
+=================
+CG_Field_CompleteVoiceChat
+=================
+*/
+static void CG_Field_CompleteVoiceChat( void ) {
+	trap_Field_CompleteList(
+		VOICECHAT_BASEATTACK "\0"
+		VOICECHAT_CAMP "\0"
+		VOICECHAT_DEATHINSULT "\0"
+		VOICECHAT_DEFEND "\0"
+		VOICECHAT_DEFENDFLAG "\0"
+		VOICECHAT_ENEMYHASFLAG "\0"
+		VOICECHAT_FOLLOWFLAGCARRIER "\0"
+		VOICECHAT_FOLLOWME "\0"
+		VOICECHAT_GETFLAG "\0"
+		VOICECHAT_IHAVEFLAG "\0"
+		VOICECHAT_INPOSITION "\0"
+		VOICECHAT_KILLGAUNTLET "\0"
+		VOICECHAT_KILLINSULT "\0"
+		VOICECHAT_NO "\0"
+		VOICECHAT_OFFENSE "\0"
+		VOICECHAT_ONCAMPING "\0"
+		VOICECHAT_ONDEFENSE "\0"
+		VOICECHAT_ONFOLLOW "\0"
+		VOICECHAT_ONFOLLOWCARRIER "\0"
+		VOICECHAT_ONGETFLAG "\0"
+		VOICECHAT_ONOFFENSE "\0"
+		VOICECHAT_ONPATROL "\0"
+		VOICECHAT_ONRETURNFLAG "\0"
+		VOICECHAT_PATROL "\0"
+		VOICECHAT_PRAISE "\0"
+		VOICECHAT_RETURNFLAG "\0"
+		VOICECHAT_STARTLEADER "\0"
+		VOICECHAT_STOPLEADER "\0"
+		VOICECHAT_TAUNT "\0"
+		VOICECHAT_TRASH "\0"
+		VOICECHAT_WANTONDEFENSE "\0"
+		VOICECHAT_WANTONOFFENSE "\0"
+		VOICECHAT_WHOISLEADER "\0"
+		VOICECHAT_YES "\0"
+	);
+}
+
+/*
+=================
+CG_VoiceSayComplete
+=================
+*/
+static void CG_VoiceSayComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompleteVoiceChat();
+	}
+}
+
+/*
+=================
+CG_VoiceTellComplete
+=================
+*/
+static void CG_VoiceTellComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerName( -1, qfalse, qfalse );
+	}
+	if ( argNum == 3 ) {
+		CG_Field_CompleteVoiceChat();
+	}
+}
+#endif
+
+/*
+=================
+CG_GiveComplete
+
+Game VM combines all arguments but completion works on separate words.
+This is kind of an ugly hack to avoid having to quote item names containing spaces.
+=================
+*/
+static void CG_GiveComplete( int localPlayerNum, char *args, int argNum ) {
+	char builtinNames[] = "all\0ammo\0armor\0assist\0defend\0excellent\0gauntletaward\0health\0impressive\0weapons\0";
+	char list[2048], *name, *typedName;
+	int i, j, listTotalLength, typedNameLength;
+	gitem_t *item;
+
+	// ZTM: FIXME: have to clear whole list because CG_AddStringToList doesn't properly terminate list
+	memset( list, 0, sizeof( list ) );
+	listTotalLength = 0;
+
+	if ( argNum == 2 ) {
+		memcpy( list, builtinNames, ARRAY_LEN( builtinNames ) - 1 );
+		listTotalLength = ARRAY_LEN( builtinNames ) - 1;
+	}
+
+	// skip "give " or NULL if no space character
+	typedName = strchr( args, ' ' );
+	if ( typedName ) {
+		typedName++;
+		typedNameLength = strlen( typedName );
+	} else {
+		typedNameLength = 0;
+	}
+
+	for ( i = 1; i < BG_NumItems(); i++ ) {
+		item = BG_ItemForItemNum( i );
+		name = item->pickup_name;
+
+		//
+		// complete item names with spaces across multiple arguments instead of adding quotes
+		//
+
+		// check if matches previously typed words
+		if ( typedName && Q_stricmpn( typedName, name, typedNameLength ) ) {
+			continue;
+		}
+
+		// find current word for argument
+		for ( j = 0; j < argNum - 2 && name; j++ ) {
+			name = strchr( name, ' ' );
+			if ( name ) {
+				name++;
+			}
+		}
+
+		if ( name && *name ) {
+			CG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
+		}
+	}
+
+	if ( listTotalLength > 0 ) {
+		list[listTotalLength++] = 0;
+		trap_Field_CompleteList( list );
+	}
+}
+
+/*
+=================
+CG_FollowComplete
+=================
+*/
+static void CG_FollowComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		CG_Field_CompletePlayerName( TEAM_SPECTATOR, qtrue, qtrue );
+	}
+}
+
+/*
+=================
+CG_TeamComplete
+=================
+*/
+static void CG_TeamComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		trap_Field_CompleteList( "blue\0follow1\0follow2\0free\0red\0scoreboard\0spectator\0" );
+	}
+}
+
+/*
+=================
+CG_CallVoteComplete
+=================
+*/
+static void CG_CallVoteComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		trap_Field_CompleteList( "capturelimit\0fraglimit\0g_doWarmup\0g_gametype\0g_instagib\0kick\0kicknum\0map\0map_restart\0nextmap\0timelimit\0" );
+	}
+	if ( argNum == 3 && !Q_stricmp( CG_Argv( 1 ), "kick" ) ) {
+		CG_Field_CompletePlayerName( -1, qfalse, qfalse );
+	}
+	if ( argNum == 3 && !Q_stricmp( CG_Argv( 1 ), "map" ) ) {
+		trap_Field_CompleteFilename( "maps", ".bsp", qtrue, qfalse );
+	}
+}
+
+/*
+=================
+CG_VoteComplete
+=================
+*/
+static void CG_VoteComplete( int localPlayerNum, char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		trap_Field_CompleteList( "no\0yes\0" );
+	}
+}
+
+/*
+=================
+CG_CallTeamVoteComplete
+=================
+*/
+static void CG_CallTeamVoteComplete( int localPlayerNum, char *args, int argNum ) {
+	int playerNum, team;
+	playerInfo_t *pi;
+
+	if ( !cg.snap ) {
+		return;
+	}
+
+	playerNum = cg.localPlayers[localPlayerNum].playerNum;
+	if ( playerNum == -1 ) {
+		return;
+	}
+
+	pi = &cgs.playerinfo[playerNum];
+	if ( !pi->infoValid ) {
+		return;
+	}
+
+	team = pi->team;
+	if ( team != TEAM_BLUE && team != TEAM_RED ) {
+		return;
+	}
+
+	if ( argNum == 2 ) {
+		trap_Field_CompleteList( "leader\0" );
+	}
+	if ( argNum == 3 && !Q_stricmp( CG_Argv( 1 ), "leader" ) ) {
+		CG_Field_CompletePlayerName( team, qfalse, qfalse );
+	}
+}
+
 static consoleCommand_t	cg_commands[] = {
 	{ "+vstr", CG_VstrDown_f, 0, CG_VstrComplete },
 	{ "-vstr", CG_VstrUp_f, 0, CG_VstrComplete },
@@ -1419,8 +1717,8 @@ static playerConsoleCommand_t	playerCommands[] = {
 	{ "tell_target", CG_TellTarget_f, CMD_INGAME },
 	{ "tell_attacker", CG_TellAttacker_f, CMD_INGAME },
 #ifdef MISSIONPACK
-	{ "vtell_target", CG_VoiceTellTarget_f, CMD_INGAME },
-	{ "vtell_attacker", CG_VoiceTellAttacker_f, CMD_INGAME },
+	{ "vtell_target", CG_VoiceTellTarget_f, CMD_INGAME, CG_VoiceSayComplete },
+	{ "vtell_attacker", CG_VoiceTellAttacker_f, CMD_INGAME, CG_VoiceSayComplete },
 	{ "nextTeamMember", CG_NextTeamMember_f, CMD_INGAME },
 	{ "prevTeamMember", CG_PrevTeamMember_f, CMD_INGAME },
 	{ "nextOrder", CG_NextOrder_f, CMD_INGAME },
@@ -1450,7 +1748,41 @@ static playerConsoleCommand_t	playerCommands[] = {
 	{ "weapnext", CG_NextWeapon_f, CMD_INGAME },
 	{ "weapprev", CG_PrevWeapon_f, CMD_INGAME },
 	{ "weapon", CG_Weapon_f, CMD_INGAME },
-	{ "weaponToggle", CG_WeaponToggle_f, CMD_INGAME }
+	{ "weaponToggle", CG_WeaponToggle_f, CMD_INGAME },
+
+	//
+	// These commands will be forwarded to the server and interpret by the Game VM.
+	//
+	{ "say", CG_ForwardToServer_f, CMD_INGAME },
+	{ "say_team", CG_ForwardToServer_f, CMD_INGAME },
+	{ "tell", CG_ForwardToServer_f, CMD_INGAME, CG_TellComplete },
+#ifdef MISSIONPACK
+	{ "vsay", CG_ForwardToServer_f, CMD_INGAME, CG_VoiceSayComplete },
+	{ "vsay_team", CG_ForwardToServer_f, CMD_INGAME, CG_VoiceSayComplete },
+	{ "vtell", CG_ForwardToServer_f, CMD_INGAME, CG_VoiceTellComplete },
+	{ "vosay", CG_ForwardToServer_f, CMD_INGAME, CG_VoiceSayComplete },
+	{ "vosay_team", CG_ForwardToServer_f, CMD_INGAME, CG_VoiceSayComplete },
+	{ "votell", CG_ForwardToServer_f, CMD_INGAME, CG_VoiceTellComplete },
+	{ "vtaunt", CG_ForwardToServer_f, CMD_INGAME },
+#endif
+	{ "give", CG_ForwardToServer_f, CMD_INGAME, CG_GiveComplete },
+	{ "god", CG_ForwardToServer_f, CMD_INGAME },
+	{ "notarget", CG_ForwardToServer_f, CMD_INGAME },
+	{ "noclip", CG_ForwardToServer_f, CMD_INGAME },
+	{ "where", CG_ForwardToServer_f, CMD_INGAME },
+	{ "kill", CG_ForwardToServer_f, CMD_INGAME },
+	{ "teamtask", CG_ForwardToServer_f, CMD_INGAME },
+	{ "levelshot", CG_ForwardToServer_f, CMD_INGAME },
+	{ "follow", CG_ForwardToServer_f, CMD_INGAME, CG_FollowComplete },
+	{ "follownext", CG_ForwardToServer_f, CMD_INGAME },
+	{ "followprev", CG_ForwardToServer_f, CMD_INGAME },
+	{ "team", CG_ForwardToServer_f, CMD_INGAME, CG_TeamComplete },
+	{ "callvote", CG_ForwardToServer_f, CMD_INGAME, CG_CallVoteComplete },
+	{ "vote", CG_ForwardToServer_f, CMD_INGAME, CG_VoteComplete },
+	{ "callteamvote", CG_ForwardToServer_f, CMD_INGAME, CG_CallTeamVoteComplete },
+	{ "teamvote", CG_ForwardToServer_f, CMD_INGAME, CG_VoteComplete },
+	{ "setviewpos", CG_ForwardToServer_f, CMD_INGAME },
+	{ "stats", CG_ForwardToServer_f, CMD_INGAME }
 };
 
 static int numPlayerCommands = ARRAY_LEN( playerCommands );
@@ -1531,13 +1863,6 @@ qboolean CG_ConsoleCommand( connstate_t state, int realTime ) {
 		}
 	}
 
-	if ( cg.connected && trap_GetDemoState() != DS_PLAYBACK ) {
-		// the game server will interpret these commands
-		trap_LiteralArgs( buffer, sizeof ( buffer ) );
-		trap_SendClientCommand( buffer );
-		return qtrue;
-	}
-
 	return qfalse;
 }
 
@@ -1615,45 +1940,4 @@ void CG_InitConsoleCommands( void ) {
 			trap_AddCommand( Com_LocalPlayerCvarName( j, playerCommands[i].cmd ) );
 		}
 	}
-
-	if ( !cg.connected ) {
-		return;
-	}
-
-	//
-	// the game server will interpret these commands, which will be automatically
-	// forwarded to the server after they are not recognized locally
-	//
-	for (i = 0; i < CG_MaxSplitView(); i++) {
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "say"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "say_team"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "tell"));
-#ifdef MISSIONPACK
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vsay"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vsay_team"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vtell"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vosay"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vosay_team"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "votell"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vtaunt"));
-#endif
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "give"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "god"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "notarget"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "noclip"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "where"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "kill"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "teamtask"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "levelshot"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "follow"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "follownext"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "followprev"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "team"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "callvote"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "vote"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "callteamvote"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "teamvote"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "setviewpos"));
-		trap_AddCommand(Com_LocalPlayerCvarName(i, "stats"));
-	}
 }

From d3240e493502e358c70f784a4e3f6a997197a188 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 25 Jun 2018 22:48:27 -0500
Subject: [PATCH 23/42] mint-arena: Increase tell_target/attacker message size

Increase message size for tell_target and tell_attacker to maximum say
message size allowed by Game VM. 120 -> 150.
---
 code/cgame/cg_consolecmds.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 38ccb3986..84a7fe6a8 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -731,62 +731,62 @@ static void CG_spLose_f( void) {
 
 static void CG_TellTarget_f( int localPlayerNum ) {
 	int		playerNum;
-	char	command[128];
-	char	message[128];
+	char	command[MAX_SAY_TEXT + 16];
+	char	message[MAX_SAY_TEXT];
 
 	playerNum = CG_CrosshairPlayer( localPlayerNum );
 	if ( playerNum == -1 ) {
 		return;
 	}
 
-	trap_Args( message, 128 );
-	Com_sprintf( command, 128, "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "tell" ), playerNum, message );
+	trap_Args( message, sizeof( message ) );
+	Com_sprintf( command, sizeof( command ), "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "tell" ), playerNum, message );
 	trap_SendClientCommand( command );
 }
 
 static void CG_TellAttacker_f( int localPlayerNum ) {
 	int		playerNum;
-	char	command[128];
-	char	message[128];
+	char	command[MAX_SAY_TEXT + 16];
+	char	message[MAX_SAY_TEXT];
 
 	playerNum = CG_LastAttacker( localPlayerNum );
 	if ( playerNum == -1 ) {
 		return;
 	}
 
-	trap_Args( message, 128 );
-	Com_sprintf( command, 128, "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "tell" ), playerNum, message );
+	trap_Args( message, sizeof( message ) );
+	Com_sprintf( command, sizeof( command ), "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "tell" ), playerNum, message );
 	trap_SendClientCommand( command );
 }
 
 #ifdef MISSIONPACK
 static void CG_VoiceTellTarget_f( int localPlayerNum ) {
 	int		playerNum;
-	char	command[128];
-	char	message[128];
+	char	command[MAX_SAY_TEXT + 16];
+	char	message[MAX_SAY_TEXT];
 
 	playerNum = CG_CrosshairPlayer( localPlayerNum );
 	if ( playerNum == -1 ) {
 		return;
 	}
 
-	trap_Args( message, 128 );
-	Com_sprintf( command, 128, "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "vtell" ), playerNum, message );
+	trap_Args( message, sizeof( message ) );
+	Com_sprintf( command, sizeof( command ), "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "vtell" ), playerNum, message );
 	trap_SendClientCommand( command );
 }
 
 static void CG_VoiceTellAttacker_f( int localPlayerNum ) {
 	int		playerNum;
-	char	command[128];
-	char	message[128];
+	char	command[MAX_SAY_TEXT + 16];
+	char	message[MAX_SAY_TEXT];
 
 	playerNum = CG_LastAttacker( localPlayerNum );
 	if ( playerNum == -1 ) {
 		return;
 	}
 
-	trap_Args( message, 128 );
-	Com_sprintf( command, 128, "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "vtell" ), playerNum, message );
+	trap_Args( message, sizeof( message ) );
+	Com_sprintf( command, sizeof( command ), "%s %i %s", Com_LocalPlayerCvarName( localPlayerNum, "vtell" ), playerNum, message );
 	trap_SendClientCommand( command );
 }
 

From a62bbfc8ba1c9ea29b62d4691d03180b95ff342b Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 25 Jun 2018 22:56:34 -0500
Subject: [PATCH 24/42] mint-arena: Remove unused variable after game client
 arg completion

---
 code/cgame/cg_consolecmds.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 84a7fe6a8..58894acce 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -1815,7 +1815,6 @@ Cmd_Argc() / Cmd_Argv()
 =================
 */
 qboolean CG_ConsoleCommand( connstate_t state, int realTime ) {
-	char		buffer[BIG_INFO_STRING];
 	const char	*cmd;
 	int		i;
 	int		localPlayerNum;

From cb00b8fb5c676f48ffc445380c16732954061bd2 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 25 Jun 2018 23:11:44 -0500
Subject: [PATCH 25/42] mint-arena: Fix callvote nextmap

---
 code/game/g_cmds.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index cff28c1c1..3bc0d66ea 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1449,16 +1449,18 @@ void Cmd_CallVote_f( gentity_t *ent ) {
 		return;
 	}
 
-	if ( ( arg2Flags & CALLVOTE_ARG2_NONE ) && arg2[0] != '\0' ) {
-		trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s does not accept an argument.\n\"", arg1 ) );
-		return;
+	if ( arg2Flags & CALLVOTE_ARG2_NONE ) {
+		if ( arg2[0] != '\0' ) {
+			trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s does not accept an argument.\n\"", arg1 ) );
+			return;
+		}
 	}
 	else if ( arg2[0] == '\0' ) {
 		trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s requires an argument.\n\"", arg1 ) );
 		return;
 	}
 
-	if ( ( arg2Flags & CALLVOTE_ARG2_INTREGAL ) ) {
+	if ( arg2Flags & CALLVOTE_ARG2_INTREGAL ) {
 		if ( !StringIsInteger( arg2 ) ) {
 			trap_SendServerCommand( ent-g_entities, va( "print \"Vote command %s argument must be a number.\n\"", arg1 ) );
 			return;

From bc6875065911b331eb9e18a83b6ac90a13a55785 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 5 Jul 2018 22:40:38 -0500
Subject: [PATCH 26/42] mint-arena: Make q3_ui arenas ignored message developer
 only

---
 code/q3_ui/ui_gameinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/q3_ui/ui_gameinfo.c b/code/q3_ui/ui_gameinfo.c
index 37a3af1c4..e8101557c 100644
--- a/code/q3_ui/ui_gameinfo.c
+++ b/code/q3_ui/ui_gameinfo.c
@@ -239,7 +239,7 @@ static void UI_LoadArenas( void ) {
 	n = ui_numSinglePlayerArenas % ARENAS_PER_TIER;
 	if( n != 0 ) {
 		ui_numSinglePlayerArenas -= n;
-		trap_Print( va( "%i arenas ignored to make count divisible by %i\n", n, ARENAS_PER_TIER ) );
+		Com_DPrintf( "%i single player arenas ignored to make count divisible by %i\n", n, ARENAS_PER_TIER );
 	}
 
 	// go through once more and assign number to the levels

From cac7d15de7b2d78f6f852e37eb489ce6472ff3ac Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Fri, 6 Jul 2018 21:17:43 -0500
Subject: [PATCH 27/42] mint-arena: Print log messages for voting

Mainly interested in printing to server console but might as well print
to games.log file too.
---
 code/game/g_cmds.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index 3bc0d66ea..da58bfdda 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1547,6 +1547,8 @@ void Cmd_CallVote_f( gentity_t *ent ) {
 		Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ), "%s", level.voteString );
 	}
 
+	G_LogPrintf( "callvote: %s: %s\n", ent->player->pers.netname, level.voteDisplayString );
+
 	trap_SendServerCommand( -1, va("print \"%s called a vote.\n\"", ent->player->pers.netname ) );
 
 	// start the voting, the caller automatically votes yes
@@ -1595,9 +1597,11 @@ void Cmd_Vote_f( gentity_t *ent ) {
 	if ( tolower( msg[0] ) == 'y' || msg[0] == '1' ) {
 		level.voteYes++;
 		trap_SetConfigstring( CS_VOTE_YES, va("%i", level.voteYes ) );
+		G_LogPrintf( "vote: %s: yes\n", ent->player->pers.netname );
 	} else {
 		level.voteNo++;
 		trap_SetConfigstring( CS_VOTE_NO, va("%i", level.voteNo ) );	
+		G_LogPrintf( "vote: %s: no\n", ent->player->pers.netname );
 	}
 
 	// a majority will be determined in CheckVote, which will also account
@@ -1715,6 +1719,8 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) {
 
 	Com_sprintf( level.teamVoteString[cs_offset], sizeof( level.teamVoteString[cs_offset] ), "%s %s", arg1, arg2 );
 
+	G_LogPrintf( "callteamvote: %s on %s team: %s\n", ent->player->pers.netname, TeamName( team ), level.teamVoteString[cs_offset] );
+
 	for ( i = 0 ; i < level.maxplayers ; i++ ) {
 		if ( level.players[i].pers.connected == CON_DISCONNECTED )
 			continue;
@@ -1778,9 +1784,11 @@ void Cmd_TeamVote_f( gentity_t *ent ) {
 	if ( tolower( msg[0] ) == 'y' || msg[0] == '1' ) {
 		level.teamVoteYes[cs_offset]++;
 		trap_SetConfigstring( CS_TEAMVOTE_YES + cs_offset, va("%i", level.teamVoteYes[cs_offset] ) );
+		G_LogPrintf( "teamvote: %s on %s team: yes\n", ent->player->pers.netname, TeamName( team ) );
 	} else {
 		level.teamVoteNo[cs_offset]++;
 		trap_SetConfigstring( CS_TEAMVOTE_NO + cs_offset, va("%i", level.teamVoteNo[cs_offset] ) );	
+		G_LogPrintf( "teamvote: %s on %s team: no\n", ent->player->pers.netname, TeamName( team ) );
 	}
 
 	// a majority will be determined in TeamCheckVote, which will also account

From 3a41ebaca0cfc9aa4ac106973e4f4a177bd7ca3f Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Fri, 6 Jul 2018 21:28:21 -0500
Subject: [PATCH 28/42] mint-arena: Avoid overbounce in PM_WaterMove

Apply my changes for avoiding overbounce from PM_WalkMove to
PM_WaterMove.

I didn't think overbounce was likely to happen there but applied the
change because Tobias Kuehnhammer did in his ioqw project.
---
 code/game/bg_pmove.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/game/bg_pmove.c b/code/game/bg_pmove.c
index d6c0b85e7..86c1f22b2 100644
--- a/code/game/bg_pmove.c
+++ b/code/game/bg_pmove.c
@@ -534,8 +534,11 @@ static void PM_WaterMove( void ) {
 		PM_ClipVelocity (pm->ps->velocity, pml.groundTrace.plane.normal, 
 			pm->ps->velocity, OVERCLIP );
 
-		VectorNormalize(pm->ps->velocity);
-		VectorScale(pm->ps->velocity, vel, pm->ps->velocity);
+		// don't decrease velocity when going up or down a slope
+		if ( pm->pmove_overbounce || VectorLength(pm->ps->velocity) > 1 ) {
+			VectorNormalize(pm->ps->velocity);
+			VectorScale(pm->ps->velocity, vel, pm->ps->velocity);
+		}
 	}
 
 	PM_SlideMove( qfalse );
@@ -800,8 +803,8 @@ static void PM_WalkMove( void ) {
 	PM_ClipVelocity (pm->ps->velocity, pml.groundTrace.plane.normal, 
 		pm->ps->velocity, OVERCLIP );
 
+	// don't decrease velocity when going up or down a slope
 	if ( pm->pmove_overbounce || VectorLength(pm->ps->velocity) > 1 ) {
-		// don't decrease velocity when going up or down a slope
 		VectorNormalize(pm->ps->velocity);
 		VectorScale(pm->ps->velocity, vel, pm->ps->velocity);
 	}

From e6f7b5a68dc2a0aca7c68fa24f8d6737778873f8 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 30 Jul 2018 04:27:02 -0500
Subject: [PATCH 29/42] mint-arena: Use fractional digits in cg_fov and
 cg_weaponFov

---
 code/cgame/cg_view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index fd8eb6b28..5cfec5b06 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -669,11 +669,11 @@ static int CG_CalcFov( void ) {
 	}
 
 	// set world fov
-	fov = cg_fov.integer;
+	fov = cg_fov.value;
 	CG_CalcFov2( &cg.refdef, &fov, &cg.refdef.fov_x, &cg.refdef.fov_y );
 
 	// set view weapon fov
-	cg.viewWeaponFov = cg_weaponFov.integer ? cg_weaponFov.integer : cg_fov.integer;
+	cg.viewWeaponFov = cg_weaponFov.value ? cg_weaponFov.value : cg_fov.value;
 	CG_CalcFov2( &cg.refdef, &cg.viewWeaponFov, &cg.refdef.weapon_fov_x, &cg.refdef.weapon_fov_y );
 
 	if ( !cg.cur_lc->zoomed ) {

From 64733d6b31cb543d0d2cb52d5218d10ac39c7720 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Tue, 28 Aug 2018 21:33:51 -0500
Subject: [PATCH 30/42] Fix loading favorites as initial source in server
 browser

When I added UIAS_GLOBAL0 in 2017 I missed changing ui_browserMaster
range clamp from 6 to 7.

Reported by cdev-tux.
---
 code/q3_ui/ui_servers2.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 25b34da85..1ae57da22 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -96,6 +96,7 @@ MULTIPLAYER MENU (SERVER BROWSER)
 #define UIAS_GLOBAL4			5
 #define UIAS_GLOBAL5			6
 #define UIAS_FAVORITES			7
+#define UIAS_NUM_SOURCES		8
 
 #define UI_MAX_MASTER_SERVERS	6
 
@@ -104,6 +105,7 @@ MULTIPLAYER MENU (SERVER BROWSER)
 #define SORT_CLIENTS		2
 #define SORT_GAMETYPE		3
 #define SORT_PING			4
+#define SORT_NUM_SORTS		5
 
 #define GAMES_ALL			0
 #define GAMES_FFA			1
@@ -114,6 +116,9 @@ MULTIPLAYER MENU (SERVER BROWSER)
 #define GAMES_1FCTF			5
 #define GAMES_OBELISK		6
 #define GAMES_HARVESTER		7
+#define GAMES_NUM_GAMES		8
+#else
+#define GAMES_NUM_GAMES		5
 #endif // MISSIONPACK
 
 static const char *master_items[] = {
@@ -1139,7 +1144,7 @@ int ArenaServers_SetType( int type )
 		char masterstr[2], cvarname[sizeof("sv_master1")];
 		int direction;
 		
-		if (type == g_servertype || type == ((g_servertype+1) % (ARRAY_LEN(master_items)-1))) {
+		if (type == g_servertype || type == ((g_servertype+1) % UIAS_NUM_SOURCES)) {
 			direction = 1;
 		} else {
 			direction = -1;
@@ -1713,7 +1718,7 @@ static void ArenaServers_MenuInit( void ) {
 	
 	ArenaServers_LoadFavorites();
 
-	g_arenaservers.master.curvalue = g_servertype = Com_Clamp( 0, 6, ui_browserMaster.integer );
+	g_arenaservers.master.curvalue = g_servertype = Com_Clamp( 0, UIAS_NUM_SOURCES-1, ui_browserMaster.integer );
 
 	g_arenaservers.game.curvalue = g_gameIndex = 0;
 	for ( i = 0; mod_dir_items[i]; i++ ) {
@@ -1723,10 +1728,10 @@ static void ArenaServers_MenuInit( void ) {
 		}
 	}
 
-	g_gametype = Com_Clamp( 0, 4, ui_browserGameType.integer );
+	g_gametype = Com_Clamp( 0, GAMES_NUM_GAMES-1, ui_browserGameType.integer );
 	g_arenaservers.gametype.curvalue = g_gametype;
 
-	g_sortkey = Com_Clamp( 0, 4, ui_browserSortKey.integer );
+	g_sortkey = Com_Clamp( 0, SORT_NUM_SORTS-1, ui_browserSortKey.integer );
 	g_arenaservers.sortkey.curvalue = g_sortkey;
 
 	g_fullservers = Com_Clamp( 0, 1, ui_browserShowFull.integer );

From af0abe284eab7787988e989a69cb42f055b07634 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Wed, 12 Sep 2018 15:47:03 -0500
Subject: [PATCH 31/42] Improve finding obelisk entitynum for bot AI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BotSetEntityNumForGoal() was checking all entities that are not
team_redobelisk (which is the obelisk visual entity) to find the
untitled obelisk collision entity. This may fail in rare cases where
there is an another entity within 10 units of the obelisk origin.
Failing to find the correct entity may cause bots to not attack the
obelisk.

Instead add BotSetEntityNumForGoalWithActivator() for looking for the
obelisk collision entity by activator classname (team_redobelisk) which
should be less likely to find the wrong entity.

This doesn't affect official Team Arena maps (unknown if it affects any
others).

Reversed strcmp check was reported by Thomas Köppe.
---
 code/game/ai_dmq3.c | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c
index 5f452c11a..ec7ac5701 100644
--- a/code/game/ai_dmq3.c
+++ b/code/game/ai_dmq3.c
@@ -5739,7 +5739,33 @@ void BotSetEntityNumForGoal(bot_goal_t *goal, char *classname) {
 		if ( !ent->inuse ) {
 			continue;
 		}
-		if ( !Q_stricmp(ent->classname, classname) ) {
+		if ( Q_stricmp(ent->classname, classname) != 0 ) {
+			continue;
+		}
+		VectorSubtract(goal->origin, ent->s.origin, dir);
+		if (VectorLengthSquared(dir) < Square(10)) {
+			goal->entitynum = i;
+			return;
+		}
+	}
+}
+
+/*
+==================
+BotSetEntityNumForGoalWithActivator
+==================
+*/
+void BotSetEntityNumForGoalWithActivator(bot_goal_t *goal, char *classname) {
+	gentity_t *ent;
+	int i;
+	vec3_t dir;
+
+	ent = &g_entities[0];
+	for (i = 0; i < level.num_entities; i++, ent++) {
+		if ( !ent->inuse || !ent->activator ) {
+			continue;
+		}
+		if ( Q_stricmp(ent->activator->classname, classname) != 0 ) {
 			continue;
 		}
 		VectorSubtract(goal->origin, ent->s.origin, dir);
@@ -5823,21 +5849,21 @@ void BotSetupDeathmatchAI(void) {
 	else if (gametype == GT_OBELISK) {
 		if (BotGetLevelItemGoal(-1, "Red Obelisk", &redobelisk) < 0)
 			BotAI_Print(PRT_WARNING, "Overload without Red Obelisk\n");
-		BotSetEntityNumForGoal(&redobelisk, "team_redobelisk");
+		BotSetEntityNumForGoalWithActivator(&redobelisk, "team_redobelisk");
 		if (BotGetLevelItemGoal(-1, "Blue Obelisk", &blueobelisk) < 0)
 			BotAI_Print(PRT_WARNING, "Overload without Blue Obelisk\n");
-		BotSetEntityNumForGoal(&blueobelisk, "team_blueobelisk");
+		BotSetEntityNumForGoalWithActivator(&blueobelisk, "team_blueobelisk");
 	}
 	else if (gametype == GT_HARVESTER) {
 		if (BotGetLevelItemGoal(-1, "Red Obelisk", &redobelisk) < 0)
 			BotAI_Print(PRT_WARNING, "Harvester without Red Obelisk\n");
-		BotSetEntityNumForGoal(&redobelisk, "team_redobelisk");
+		BotSetEntityNumForGoalWithActivator(&redobelisk, "team_redobelisk");
 		if (BotGetLevelItemGoal(-1, "Blue Obelisk", &blueobelisk) < 0)
 			BotAI_Print(PRT_WARNING, "Harvester without Blue Obelisk\n");
-		BotSetEntityNumForGoal(&blueobelisk, "team_blueobelisk");
+		BotSetEntityNumForGoalWithActivator(&blueobelisk, "team_blueobelisk");
 		if (BotGetLevelItemGoal(-1, "Neutral Obelisk", &neutralobelisk) < 0)
 			BotAI_Print(PRT_WARNING, "Harvester without Neutral Obelisk\n");
-		BotSetEntityNumForGoal(&neutralobelisk, "team_neutralobelisk");
+		BotSetEntityNumForGoalWithActivator(&neutralobelisk, "team_neutralobelisk");
 	}
 #endif
 

From 993bea4733e0b04ab13f9081f1919ad760c67667 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 15 Sep 2018 11:53:21 -0500
Subject: [PATCH 32/42] Fix predicting entity origin on rotating mover

Based on G_TryPushingEntity() in code/game/g_mover.c.
---
 code/cgame/cg_ents.c | 50 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_ents.c b/code/cgame/cg_ents.c
index adc4332b6..5a02e58e1 100644
--- a/code/cgame/cg_ents.c
+++ b/code/cgame/cg_ents.c
@@ -810,6 +810,44 @@ static void CG_Portal( centity_t *cent ) {
 }
 
 
+/*
+================
+CG_CreateRotationMatrix
+================
+*/
+void CG_CreateRotationMatrix(vec3_t angles, vec3_t matrix[3]) {
+	AngleVectors(angles, matrix[0], matrix[1], matrix[2]);
+	VectorInverse(matrix[1]);
+}
+
+/*
+================
+CG_TransposeMatrix
+================
+*/
+void CG_TransposeMatrix(vec3_t matrix[3], vec3_t transpose[3]) {
+	int i, j;
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 3; j++) {
+			transpose[i][j] = matrix[j][i];
+		}
+	}
+}
+
+/*
+================
+CG_RotatePoint
+================
+*/
+void CG_RotatePoint(vec3_t point, vec3_t matrix[3]) {
+	vec3_t tvec;
+
+	VectorCopy(point, tvec);
+	point[0] = DotProduct(matrix[0], tvec);
+	point[1] = DotProduct(matrix[1], tvec);
+	point[2] = DotProduct(matrix[2], tvec);
+}
+
 /*
 =========================
 CG_AdjustPositionForMover
@@ -821,6 +859,8 @@ void CG_AdjustPositionForMover(const vec3_t in, int moverNum, int fromTime, int
 	centity_t	*cent;
 	vec3_t	oldOrigin, origin, deltaOrigin;
 	vec3_t	oldAngles, angles, deltaAngles;
+	vec3_t	matrix[3], transpose[3];
+	vec3_t	org, org2, move2;
 
 	if ( moverNum <= 0 || moverNum >= ENTITYNUM_MAX_NORMAL ) {
 		VectorCopy( in, out );
@@ -844,9 +884,17 @@ void CG_AdjustPositionForMover(const vec3_t in, int moverNum, int fromTime, int
 	VectorSubtract( origin, oldOrigin, deltaOrigin );
 	VectorSubtract( angles, oldAngles, deltaAngles );
 
+	// origin change when on a rotating object
+	CG_CreateRotationMatrix( deltaAngles, transpose );
+	CG_TransposeMatrix( transpose, matrix );
+	VectorSubtract( in, oldOrigin, org );
+	VectorCopy( org, org2 );
+	CG_RotatePoint( org2, matrix );
+	VectorSubtract( org2, org, move2 );
+	VectorAdd( deltaOrigin, move2, deltaOrigin );
+
 	VectorAdd( in, deltaOrigin, out );
 	VectorAdd( angles_in, deltaAngles, angles_out );
-	// FIXME: origin change when on a rotating object
 }
 
 

From ca5bd9f0fdcce10f5a874145aebe779812069934 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Tue, 18 Sep 2018 13:16:38 -0500
Subject: [PATCH 33/42] mint-arena: Add argument auto completion for Game VM
 commands

Add argument auto completion for addbot, forceTeam, teleport, and tell
(new for dedicated server only, cgame already handles tell).
---
 code/cgame/cg_consolecmds.c | 60 ++++++---------------------
 code/game/bg_misc.c         | 43 ++++++++++++++++++-
 code/game/bg_public.h       |  2 +
 code/game/g_bot.c           | 37 +++++++++++++++++
 code/game/g_local.h         |  1 +
 code/game/g_svcmds.c        | 82 ++++++++++++++++++++++++++++++++++---
 6 files changed, 171 insertions(+), 54 deletions(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 58894acce..449f9aa0b 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -303,42 +303,6 @@ void CG_SetTeamHeadmodel_f( int localPlayerNum ) {
 	}
 }
 
-/*
-=============
-CG_AddStringToList
-=============
-*/
-static void CG_AddStringToList( char *list, size_t listSize, int *listLength, char *name ) {
-	size_t namelen;
-	int val;
-	char *listptr;
-
-	namelen = strlen( name );
-
-	if ( *listLength + namelen + 1 >= listSize ) {
-		return;
-	}
-
-	for ( listptr = list; *listptr; listptr += strlen( listptr ) + 1 ) {
-		val = Q_stricmp( name, listptr );
-		if ( val == 0 ) {
-			return;
-		}
-		// insert into list
-		else if ( val < 0 ) {
-			int moveBytes = *listLength - (int)( listptr - list ) + 1;
-
-			memmove( listptr + namelen + 1, listptr, moveBytes );
-			strncpy( listptr, name, namelen + 1 );
-			*listLength += namelen + 1;
-			return;
-		}
-	}
-
-	strncpy( listptr, name, namelen + 1 );
-	*listLength += namelen + 1;
-}
-
 /*
 ==================
 CG_Field_CompletePlayerModel
@@ -399,7 +363,7 @@ static void CG_Field_CompletePlayerModel( int argNum, qboolean lookingForHead, c
 	skinTeamSuffix = ( lookingForTeam == TEAM_BLUE ) ? "_blue" : "_red";
 	skinTeamSuffixLength = ( lookingForTeam == TEAM_BLUE ) ? 5 : 6;
 
-	// ZTM: FIXME: have to clear whole list because CG_AddStringToList doesn't properly terminate list
+	// ZTM: FIXME: have to clear whole list because BG_AddStringToList doesn't properly terminate list
 	memset( list, 0, sizeof( list ) );
 	listTotalLength = 0;
 
@@ -449,7 +413,7 @@ static void CG_Field_CompletePlayerModel( int argNum, qboolean lookingForHead, c
 					// models/players/example/upper_default.skin
 					// add default skin as just the model name
 					// for team models this is red or blue
-					CG_AddStringToList( list, sizeof( list ), &listTotalLength, dirptr );
+					BG_AddStringToList( list, sizeof( list ), &listTotalLength, dirptr );
 				} else if ( lookingForTeam != TEAM_FREE ) {
 					// models/players/example/upper_lily_red.skin
 					// for team model add lily_red skin as lily
@@ -459,12 +423,12 @@ static void CG_Field_CompletePlayerModel( int argNum, qboolean lookingForHead, c
 							&& COM_CompareExtension( skinname, skinTeamSuffix ) ) {
 						// remove _red
 						skinname[skinnameLength - 1 - skinTeamSuffixLength] = '\0';
-						CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "%s/%s", dirptr, skinname ) );
+						BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "%s/%s", dirptr, skinname ) );
 					}
 				} else {
 					// models/players/example/upper_lily.skin
 					// misc ffa skins
-					CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "%s/%s", dirptr, skinname ) );
+					BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "%s/%s", dirptr, skinname ) );
 				}
 			}
 		}
@@ -517,7 +481,7 @@ static void CG_Field_CompletePlayerModel( int argNum, qboolean lookingForHead, c
 					// models/players/heads/example/head_default.skin
 					// add default skin as just the model name
 					// for team models this is red or blue
-					CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s", dirptr ) );
+					BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s", dirptr ) );
 				} else if ( lookingForTeam != TEAM_FREE ) {
 					// models/players/heads/example/head_lily_red.skin
 					// for team model add lily_red skin as lily
@@ -527,12 +491,12 @@ static void CG_Field_CompletePlayerModel( int argNum, qboolean lookingForHead, c
 							&& COM_CompareExtension( skinname, skinTeamSuffix ) ) {
 						// remove _red
 						skinname[skinnameLength - 1 - skinTeamSuffixLength] = '\0';
-						CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s/%s", dirptr, skinname ) );
+						BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s/%s", dirptr, skinname ) );
 					}
 				} else {
 					// models/players/heads/example/head_lily.skin
 					// misc ffa skins
-					CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s/%s", dirptr, skinname ) );
+					BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "*%s/%s", dirptr, skinname ) );
 				}
 			}
 		}
@@ -1328,7 +1292,7 @@ static void CG_Field_CompletePlayerName( int team, qboolean excludeTeam, qboolea
 		return;
 	}
 
-	// ZTM: FIXME: have to clear whole list because CG_AddStringToList doesn't properly terminate list
+	// ZTM: FIXME: have to clear whole list because BG_AddStringToList doesn't properly terminate list
 	memset( list, 0, sizeof( list ) );
 	listTotalLength = 0;
 
@@ -1351,9 +1315,9 @@ static void CG_Field_CompletePlayerName( int team, qboolean excludeTeam, qboolea
 
 		// Use quotes if there is a space in the name
 		if ( strchr( name, ' ' ) != NULL ) {
-			CG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "\"%s\"", name ) );
+			BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "\"%s\"", name ) );
 		} else {
-			CG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
+			BG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
 		}
 	}
 
@@ -1459,7 +1423,7 @@ static void CG_GiveComplete( int localPlayerNum, char *args, int argNum ) {
 	int i, j, listTotalLength, typedNameLength;
 	gitem_t *item;
 
-	// ZTM: FIXME: have to clear whole list because CG_AddStringToList doesn't properly terminate list
+	// ZTM: FIXME: have to clear whole list because BG_AddStringToList doesn't properly terminate list
 	memset( list, 0, sizeof( list ) );
 	listTotalLength = 0;
 
@@ -1499,7 +1463,7 @@ static void CG_GiveComplete( int localPlayerNum, char *args, int argNum ) {
 		}
 
 		if ( name && *name ) {
-			CG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
+			BG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
 		}
 	}
 
diff --git a/code/game/bg_misc.c b/code/game/bg_misc.c
index d7da6c822..1e3d3b2b1 100644
--- a/code/game/bg_misc.c
+++ b/code/game/bg_misc.c
@@ -1885,6 +1885,42 @@ void BG_DecomposeUserCmdValue( int value, int *weapon ) {
 	BG_DecomposeBits( value, &bitsUsed, weapon, WEAPONNUM_BITS );
 }
 
+/*
+=============
+BG_AddStringToList
+=============
+*/
+void BG_AddStringToList( char *list, size_t listSize, int *listLength, char *name ) {
+	size_t namelen;
+	int val;
+	char *listptr;
+
+	namelen = strlen( name );
+
+	if ( *listLength + namelen + 1 >= listSize ) {
+		return;
+	}
+
+	for ( listptr = list; *listptr; listptr += strlen( listptr ) + 1 ) {
+		val = Q_stricmp( name, listptr );
+		if ( val == 0 ) {
+			return;
+		}
+		// insert into list
+		else if ( val < 0 ) {
+			int moveBytes = *listLength - (int)( listptr - list ) + 1;
+
+			memmove( listptr + namelen + 1, listptr, moveBytes );
+			strncpy( listptr, name, namelen + 1 );
+			*listLength += namelen + 1;
+			return;
+		}
+	}
+
+	strncpy( listptr, name, namelen + 1 );
+	*listLength += namelen + 1;
+}
+
 /*
 ======================
 SnapVectorTowards
@@ -1907,8 +1943,13 @@ void SnapVectorTowards( vec3_t v, vec3_t to ) {
 	}
 }
 
+/*
+=============
+cmdcmp
+=============
+*/
 int cmdcmp( const void *a, const void *b ) {
-  return Q_stricmp( (const char *)a, ((dummyCmd_t *)b)->name );
+	return Q_stricmp( (const char *)a, ((dummyCmd_t *)b)->name );
 }
 
 /*
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index 7f6df5767..9d65221cc 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -1123,6 +1123,8 @@ qboolean	BG_PlayerTouchesItem( playerState_t *ps, entityState_t *item, int atTim
 int		BG_ComposeUserCmdValue( int weapon );
 void	BG_DecomposeUserCmdValue( int value, int *weapon );
 
+void	BG_AddStringToList( char *list, size_t listSize, int *listLength, char *name );
+
 void	SnapVectorTowards( vec3_t v, vec3_t to );
 
 #define ARENAS_PER_TIER		4
diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index fbf6bf548..616424e3b 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -845,6 +845,43 @@ void Svcmd_AddBot_f( void ) {
 	}
 }
 
+/*
+===============
+Svcmd_AddBotComplete
+===============
+*/
+void Svcmd_AddBotComplete( char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		int i;
+		char name[MAX_NAME_LENGTH];
+		char list[32000]; // [MAX_BOTS * MAX_NAME_LENGTH] is too big to fit in QVM locals (max 32k)
+		int listTotalLength;
+
+		// ZTM: FIXME: have to clear whole list because BG_AddStringToList doesn't properly terminate list
+		memset( list, 0, sizeof( list ) );
+		listTotalLength = 0;
+
+		for (i = 0; i < g_numBots; i++) {
+			Q_strncpyz( name, Info_ValueForKey( g_botInfos[i], "name" ), sizeof ( name ) );
+			Q_CleanStr( name );
+
+			// Use quotes if there is a space in the name
+			if ( strchr( name, ' ' ) != NULL ) {
+				BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "\"%s\"", name ) );
+			} else {
+				BG_AddStringToList( list, sizeof( list ), &listTotalLength, name );
+			}
+		}
+
+		if ( listTotalLength > 0 ) {
+			list[listTotalLength++] = 0;
+			trap_Field_CompleteList( list );
+		}
+	} else if ( argNum == 4 ) {
+		trap_Field_CompleteList( "blue\0follow1\0follow2\0free\0red\0scoreboard\0spectator\0" );
+	}
+}
+
 /*
 ===============
 Svcmd_BotList_f
diff --git a/code/game/g_local.h b/code/game/g_local.h
index b8ed51422..55368e598 100644
--- a/code/game/g_local.h
+++ b/code/game/g_local.h
@@ -724,6 +724,7 @@ void G_CheckBotSpawn( void );
 void G_RemoveQueuedBotBegin( int playerNum );
 qboolean G_BotConnect( int playerNum, qboolean restart );
 void Svcmd_AddBot_f( void );
+void Svcmd_AddBotComplete( char *args, int argNum );
 void Svcmd_BotList_f( void );
 void BotInterbreedEndMatch( void );
 
diff --git a/code/game/g_svcmds.c b/code/game/g_svcmds.c
index be040a045..91f799746 100644
--- a/code/game/g_svcmds.c
+++ b/code/game/g_svcmds.c
@@ -389,7 +389,7 @@ void	Svcmd_EntityList_f (void) {
 int PlayerForString( const char *s ) {
 	gplayer_t	*cl;
 	int			idnum;
-	char		cleanName[MAX_STRING_CHARS];
+	char		cleanName[MAX_NETNAME];
 
 	// numeric values could be slot numbers
 	if ( StringIsInteger( s ) ) {
@@ -419,6 +419,43 @@ int PlayerForString( const char *s ) {
 	return -1;
 }
 
+/*
+===================
+G_Field_CompletePlayerName
+===================
+*/
+void G_Field_CompletePlayerName( void ) {
+	gplayer_t	*cl;
+	int			idnum;
+	char		cleanName[MAX_NETNAME];
+	char		list[MAX_CLIENTS * MAX_NETNAME];
+	int			listTotalLength;
+
+	// ZTM: FIXME: have to clear whole list because BG_AddStringToList doesn't properly terminate list
+	memset( list, 0, sizeof( list ) );
+	listTotalLength = 0;
+
+	for ( idnum=0,cl=level.players ; idnum < level.maxplayers ; idnum++,cl++ ) {
+		if ( cl->pers.connected != CON_CONNECTED ) {
+			continue;
+		}
+		Q_strncpyz(cleanName, cl->pers.netname, sizeof(cleanName));
+		Q_CleanStr(cleanName);
+
+		// Use quotes if there is a space in the name
+		if ( strchr( cleanName, ' ' ) != NULL ) {
+			BG_AddStringToList( list, sizeof( list ), &listTotalLength, va( "\"%s\"", cleanName ) );
+		} else {
+			BG_AddStringToList( list, sizeof( list ), &listTotalLength, cleanName );
+		}
+	}
+
+	if ( listTotalLength > 0 ) {
+		list[listTotalLength++] = 0;
+		trap_Field_CompleteList( list );
+	}
+}
+
 /*
 ===================
 Svcmd_ForceTeam_f
@@ -447,6 +484,19 @@ void	Svcmd_ForceTeam_f( void ) {
 	SetTeam( &g_entities[playerNum], str );
 }
 
+/*
+===================
+Svcmd_ForceTeamComplete
+===================
+*/
+void	Svcmd_ForceTeamComplete( char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		G_Field_CompletePlayerName();
+	} else if ( argNum == 3 ) {
+		trap_Field_CompleteList( "blue\0follow1\0follow2\0free\0red\0scoreboard\0spectator\0" );
+	}
+}
+
 /*
 ===================
 Svcmd_Teleport_f
@@ -498,6 +548,17 @@ void	Svcmd_Teleport_f( void ) {
 	TeleportPlayer( ent, position, angles );
 }
 
+/*
+===================
+Svcmd_TeleportComplete
+===================
+*/
+void	Svcmd_TeleportComplete( char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		G_Field_CompletePlayerName();
+	}
+}
+
 /*
 ===================
 Svcmd_ListIPs_f
@@ -556,6 +617,17 @@ void	Svcmd_Tell_f( void ) {
 	G_Say( NULL, target, SAY_TELL, p );
 }
 
+/*
+===================
+Svcmd_TellComplete
+===================
+*/
+void	Svcmd_TellComplete( char *args, int argNum ) {
+	if ( argNum == 2 ) {
+		G_Field_CompletePlayerName();
+	}
+}
+
 struct svcmd
 {
   char     *cmd;
@@ -564,17 +636,17 @@ struct svcmd
   void     ( *complete )( char *, int );
 } svcmds[ ] = {
   { "abort_podium", qfalse, Svcmd_AbortPodium_f },
-  { "addbot", qfalse, Svcmd_AddBot_f },
+  { "addbot", qfalse, Svcmd_AddBot_f, Svcmd_AddBotComplete },
   { "addip", qfalse, Svcmd_AddIP_f },
   { "botlist", qfalse, Svcmd_BotList_f },
   { "botreport", qfalse, Svcmd_BotTeamplayReport_f },
   { "entityList", qfalse, Svcmd_EntityList_f },
-  { "forceTeam", qfalse, Svcmd_ForceTeam_f },
+  { "forceTeam", qfalse, Svcmd_ForceTeam_f, Svcmd_ForceTeamComplete },
   { "listip", qfalse, Svcmd_ListIPs_f },
   { "removeip", qfalse, Svcmd_RemoveIP_f },
   { "say", qtrue, Svcmd_Say_f },
-  { "teleport", qfalse, Svcmd_Teleport_f },
-  { "tell", qtrue, Svcmd_Tell_f },
+  { "teleport", qfalse, Svcmd_Teleport_f, Svcmd_TeleportComplete },
+  { "tell", qtrue, Svcmd_Tell_f, Svcmd_TellComplete },
 };
 
 const size_t numSvCmds = ARRAY_LEN(svcmds);

From fe2c63778ca4487149314377d076563d9a9071e7 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 27 Sep 2018 21:13:13 -0500
Subject: [PATCH 34/42] mint-arena: Change version for 1.0-devil

---
 Makefile               | 2 +-
 code/cgame/cg_public.h | 2 +-
 code/game/bg_public.h  | 2 +-
 code/game/g_public.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9c336a1d8..284e0fd40 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=0.6
+VERSION=1.0-devil
 endif
 
 ifndef VM_PREFIX
diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index cfac54912..b9c94b558 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -36,7 +36,7 @@ Suite 120, Rockville, Maryland 20850 USA.
 // major 0 means each minor is an API break.
 // major > 0 means each major is an API break and each minor extends API.
 #define CG_API_MAJOR_VERSION	0
-#define CG_API_MINOR_VERSION	38
+#define CG_API_MINOR_VERSION	39
 
 
 #define	CMD_BACKUP			64	
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index 9d65221cc..cd5426871 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -44,7 +44,7 @@ Suite 120, Rockville, Maryland 20850 USA.
 
 // Keep this in-sync with VERSION in Makefile.
 #ifndef PRODUCT_VERSION
-	#define PRODUCT_VERSION			"0.6"
+	#define PRODUCT_VERSION			"1.0-devil"
 #endif
 
 // because games can change separately from the main system protocol, we need a
diff --git a/code/game/g_public.h b/code/game/g_public.h
index 03489b9af..685547eff 100644
--- a/code/game/g_public.h
+++ b/code/game/g_public.h
@@ -36,7 +36,7 @@ Suite 120, Rockville, Maryland 20850 USA.
 // major 0 means each minor is an API break.
 // major > 0 means each major is an API break and each minor extends API.
 #define	GAME_API_MAJOR_VERSION	0
-#define	GAME_API_MINOR_VERSION	15
+#define	GAME_API_MINOR_VERSION	16
 
 
 // entity->svFlags

From 147c551b22c0a077dc6c43c42ed75db0168b0e36 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 27 Sep 2018 21:17:32 -0500
Subject: [PATCH 35/42] mint-arena: Add left/right ALT, mwheel left/right, and
 world 96-255

Add left/right ALT, CTRL, SHIFT, WINDOWS, COMMAND keys.
Add mouse wheel left and right keys.
Add more 'world keys' to cover all scan codes of unknown keys.
---
 code/cgame/cg_console.c   |  18 ++--
 code/cgame/cg_field.c     |   6 +-
 code/cgame/cg_main.c      |   2 +-
 code/client/keycodes.h    | 182 ++++++++++++++++++++++++++++++++++++--
 code/q3_ui/ui_controls2.c |   6 +-
 code/ui/ui_shared.c       |  10 +--
 6 files changed, 196 insertions(+), 28 deletions(-)

diff --git a/code/cgame/cg_console.c b/code/cgame/cg_console.c
index 78013c5e8..164404f72 100644
--- a/code/cgame/cg_console.c
+++ b/code/cgame/cg_console.c
@@ -500,7 +500,7 @@ void Console_Key ( int key, qboolean down ) {
 	}
 
 	// ctrl-L clears screen
-	if ( key == 'l' && trap_Key_IsDown( K_CTRL ) ) {
+	if ( key == 'l' && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) {
 		trap_Cmd_ExecuteText( EXEC_APPEND, "clear\n" );
 		return;
 	}
@@ -576,8 +576,8 @@ void Console_Key ( int key, qboolean down ) {
 
 	// command history (ctrl-p ctrl-n for unix style)
 
-	if ( ( key == K_MWHEELUP && trap_Key_IsDown( K_SHIFT ) ) || ( key == K_UPARROW ) || ( key == K_KP_UPARROW ) ||
-		 ( ( tolower(key) == 'p' ) && trap_Key_IsDown( K_CTRL ) ) ) {
+	if ( ( key == K_MWHEELUP && ( trap_Key_IsDown( K_LEFTSHIFT ) || trap_Key_IsDown( K_RIGHTSHIFT ) ) ) || ( key == K_UPARROW ) || ( key == K_KP_UPARROW ) ||
+		 ( ( tolower(key) == 'p' ) && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) ) {
 		if ( nextHistoryLine - historyLine < COMMAND_HISTORY 
 			&& historyLine > 0 ) {
 			historyLine--;
@@ -586,8 +586,8 @@ void Console_Key ( int key, qboolean down ) {
 		return;
 	}
 
-	if ( ( key == K_MWHEELDOWN && trap_Key_IsDown( K_SHIFT ) ) || ( key == K_DOWNARROW ) || ( key == K_KP_DOWNARROW ) ||
-		 ( ( tolower(key) == 'n' ) && trap_Key_IsDown( K_CTRL ) ) ) {
+	if ( ( key == K_MWHEELDOWN && ( trap_Key_IsDown( K_LEFTSHIFT ) || trap_Key_IsDown( K_RIGHTSHIFT ) ) ) || ( key == K_DOWNARROW ) || ( key == K_KP_DOWNARROW ) ||
+		 ( ( tolower(key) == 'n' ) && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) ) {
 		historyLine++;
 		if (historyLine >= nextHistoryLine) {
 			historyLine = nextHistoryLine;
@@ -612,7 +612,7 @@ void Console_Key ( int key, qboolean down ) {
 
 	if ( key == K_MWHEELUP) {	//----(SA)	added some mousewheel functionality to the console
 		Con_PageUp();
-		if ( trap_Key_IsDown( K_CTRL ) ) {	// hold <ctrl> to accelerate scrolling
+		if ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) {	// hold <ctrl> to accelerate scrolling
 			Con_PageUp();
 			Con_PageUp();
 		}
@@ -621,7 +621,7 @@ void Console_Key ( int key, qboolean down ) {
 
 	if ( key == K_MWHEELDOWN) {	//----(SA)	added some mousewheel functionality to the console
 		Con_PageDown();
-		if ( trap_Key_IsDown( K_CTRL ) ) {	// hold <ctrl> to accelerate scrolling
+		if ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) {	// hold <ctrl> to accelerate scrolling
 			Con_PageDown();
 			Con_PageDown();
 		}
@@ -629,13 +629,13 @@ void Console_Key ( int key, qboolean down ) {
 	}
 
 	// ctrl-home = top of console
-	if ( ( key == K_HOME || key == K_KP_HOME ) && trap_Key_IsDown( K_CTRL ) ) {
+	if ( ( key == K_HOME || key == K_KP_HOME ) && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) {
 		Con_Top();
 		return;
 	}
 
 	// ctrl-end = bottom of console
-	if ( ( key == K_END || key == K_KP_END ) && trap_Key_IsDown( K_CTRL ) ) {
+	if ( ( key == K_END || key == K_KP_END ) && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) {
 		Con_Bottom();
 		return;
 	}
diff --git a/code/cgame/cg_field.c b/code/cgame/cg_field.c
index 78ebbff1a..5833dde90 100644
--- a/code/cgame/cg_field.c
+++ b/code/cgame/cg_field.c
@@ -158,7 +158,7 @@ Key events are used for non-printable characters, others are gotten from char ev
 */
 void MField_KeyDownEvent( mfield_t *edit, int key ) {
 	// shift-insert is paste
-	if ( ( ( key == K_INS ) || ( key == K_KP_INS ) ) && trap_Key_IsDown( K_SHIFT ) ) {
+	if ( ( ( key == K_INS ) || ( key == K_KP_INS ) ) && ( trap_Key_IsDown( K_LEFTSHIFT ) || trap_Key_IsDown( K_RIGHTSHIFT ) ) ) {
 		MField_Paste( edit );
 		return;
 	}
@@ -199,13 +199,13 @@ void MField_KeyDownEvent( mfield_t *edit, int key ) {
 		return;
 	}
 
-	if ( key == K_HOME || key == K_KP_HOME || ( tolower(key) == 'a' && trap_Key_IsDown( K_CTRL ) ) ) {
+	if ( key == K_HOME || key == K_KP_HOME || ( tolower(key) == 'a' && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) ) {
 		edit->cursor = 0;
 		edit->scroll = 0;
 		return;
 	}
 
-	if ( key == K_END || key == K_KP_END || ( tolower(key) == 'e' && trap_Key_IsDown( K_CTRL ) ) ) {
+	if ( key == K_END || key == K_KP_END || ( tolower(key) == 'e' && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) ) {
 		edit->cursor = edit->len;
 		edit->scroll = edit->len - edit->widthInChars + 1;
 		if (edit->scroll < 0)
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index da2e8bae5..e1855391b 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -3053,7 +3053,7 @@ void CG_DistributeKeyEvent( int key, qboolean down, unsigned time, connstate_t s
 	}
 
 	// console key is hardcoded, so the user can never unbind it
-	if( key == K_CONSOLE || ( key == K_ESCAPE && trap_Key_IsDown( K_SHIFT ) ) ) {
+	if( key == K_CONSOLE || ( key == K_ESCAPE && ( trap_Key_IsDown( K_LEFTSHIFT ) || trap_Key_IsDown( K_RIGHTSHIFT ) ) ) ) {
 		if ( down ) {
 			Con_ToggleConsole_f();
 		}
diff --git a/code/client/keycodes.h b/code/client/keycodes.h
index 696f7d3db..81089e67c 100644
--- a/code/client/keycodes.h
+++ b/code/client/keycodes.h
@@ -45,8 +45,7 @@ typedef enum {
 
 	K_BACKSPACE = 127,
 
-	K_COMMAND = 128,
-	K_CAPSLOCK,
+	K_CAPSLOCK = 128,
 	K_POWER,
 	K_PAUSE,
 
@@ -55,9 +54,17 @@ typedef enum {
 	K_LEFTARROW,
 	K_RIGHTARROW,
 
-	K_ALT,
-	K_CTRL,
-	K_SHIFT,
+	K_LEFTALT,
+	K_RIGHTALT,
+	K_LEFTCTRL,
+	K_RIGHTCTRL,
+	K_LEFTSHIFT,
+	K_RIGHTSHIFT,
+	K_LEFTSUPER,
+	K_RIGHTSUPER,
+	K_LEFTCOMMAND,
+	K_RIGHTCOMMAND,
+
 	K_INS,
 	K_DEL,
 	K_PGDN,
@@ -106,8 +113,10 @@ typedef enum {
 	K_MOUSE4,
 	K_MOUSE5,
 
-	K_MWHEELDOWN,
 	K_MWHEELUP,
+	K_MWHEELDOWN,
+	K_MWHEELLEFT,
+	K_MWHEELRIGHT,
 
 	// player 1
 	K_FIRST_JOY,
@@ -370,8 +379,167 @@ typedef enum {
 	K_WORLD_93,
 	K_WORLD_94,
 	K_WORLD_95,
+	K_WORLD_96,
+	K_WORLD_97,
+	K_WORLD_98,
+	K_WORLD_99,
+	K_WORLD_100,
+	K_WORLD_101,
+	K_WORLD_102,
+	K_WORLD_103,
+	K_WORLD_104,
+	K_WORLD_105,
+	K_WORLD_106,
+	K_WORLD_107,
+	K_WORLD_108,
+	K_WORLD_109,
+	K_WORLD_110,
+	K_WORLD_111,
+	K_WORLD_112,
+	K_WORLD_113,
+	K_WORLD_114,
+	K_WORLD_115,
+	K_WORLD_116,
+	K_WORLD_117,
+	K_WORLD_118,
+	K_WORLD_119,
+	K_WORLD_120,
+	K_WORLD_121,
+	K_WORLD_122,
+	K_WORLD_123,
+	K_WORLD_124,
+	K_WORLD_125,
+	K_WORLD_126,
+	K_WORLD_127,
+	K_WORLD_128,
+	K_WORLD_129,
+	K_WORLD_130,
+	K_WORLD_131,
+	K_WORLD_132,
+	K_WORLD_133,
+	K_WORLD_134,
+	K_WORLD_135,
+	K_WORLD_136,
+	K_WORLD_137,
+	K_WORLD_138,
+	K_WORLD_139,
+	K_WORLD_140,
+	K_WORLD_141,
+	K_WORLD_142,
+	K_WORLD_143,
+	K_WORLD_144,
+	K_WORLD_145,
+	K_WORLD_146,
+	K_WORLD_147,
+	K_WORLD_148,
+	K_WORLD_149,
+	K_WORLD_150,
+	K_WORLD_151,
+	K_WORLD_152,
+	K_WORLD_153,
+	K_WORLD_154,
+	K_WORLD_155,
+	K_WORLD_156,
+	K_WORLD_157,
+	K_WORLD_158,
+	K_WORLD_159,
+	K_WORLD_160,
+	K_WORLD_161,
+	K_WORLD_162,
+	K_WORLD_163,
+	K_WORLD_164,
+	K_WORLD_165,
+	K_WORLD_166,
+	K_WORLD_167,
+	K_WORLD_168,
+	K_WORLD_169,
+	K_WORLD_170,
+	K_WORLD_171,
+	K_WORLD_172,
+	K_WORLD_173,
+	K_WORLD_174,
+	K_WORLD_175,
+	K_WORLD_176,
+	K_WORLD_177,
+	K_WORLD_178,
+	K_WORLD_179,
+	K_WORLD_180,
+	K_WORLD_181,
+	K_WORLD_182,
+	K_WORLD_183,
+	K_WORLD_184,
+	K_WORLD_185,
+	K_WORLD_186,
+	K_WORLD_187,
+	K_WORLD_188,
+	K_WORLD_189,
+	K_WORLD_190,
+	K_WORLD_191,
+	K_WORLD_192,
+	K_WORLD_193,
+	K_WORLD_194,
+	K_WORLD_195,
+	K_WORLD_196,
+	K_WORLD_197,
+	K_WORLD_198,
+	K_WORLD_199,
+	K_WORLD_200,
+	K_WORLD_201,
+	K_WORLD_202,
+	K_WORLD_203,
+	K_WORLD_204,
+	K_WORLD_205,
+	K_WORLD_206,
+	K_WORLD_207,
+	K_WORLD_208,
+	K_WORLD_209,
+	K_WORLD_210,
+	K_WORLD_211,
+	K_WORLD_212,
+	K_WORLD_213,
+	K_WORLD_214,
+	K_WORLD_215,
+	K_WORLD_216,
+	K_WORLD_217,
+	K_WORLD_218,
+	K_WORLD_219,
+	K_WORLD_220,
+	K_WORLD_221,
+	K_WORLD_222,
+	K_WORLD_223,
+	K_WORLD_224,
+	K_WORLD_225,
+	K_WORLD_226,
+	K_WORLD_227,
+	K_WORLD_228,
+	K_WORLD_229,
+	K_WORLD_230,
+	K_WORLD_231,
+	K_WORLD_232,
+	K_WORLD_233,
+	K_WORLD_234,
+	K_WORLD_235,
+	K_WORLD_236,
+	K_WORLD_237,
+	K_WORLD_238,
+	K_WORLD_239,
+	K_WORLD_240,
+	K_WORLD_241,
+	K_WORLD_242,
+	K_WORLD_243,
+	K_WORLD_244,
+	K_WORLD_245,
+	K_WORLD_246,
+	K_WORLD_247,
+	K_WORLD_248,
+	K_WORLD_249,
+	K_WORLD_250,
+	K_WORLD_251,
+	K_WORLD_252,
+	K_WORLD_253,
+	K_WORLD_254,
+	K_WORLD_255,
 
-	K_SUPER,
 	K_COMPOSE,
 	K_MODE,
 	K_HELP,
diff --git a/code/q3_ui/ui_controls2.c b/code/q3_ui/ui_controls2.c
index 52bcfcb09..b063d353a 100644
--- a/code/q3_ui/ui_controls2.c
+++ b/code/q3_ui/ui_controls2.c
@@ -269,7 +269,7 @@ static bind_t g_bindings[] =
 {
 	{"+scores",			"show scores",		ID_SHOWSCORES,	ANIM_IDLE,		K_TAB,			-1,		-1, -1},
 	{"+button2",		"use item",			ID_USEITEM,		ANIM_IDLE,		K_ENTER,		-1,		-1, -1},
-	{"+speed", 			"run / walk",		ID_SPEED,		ANIM_RUN,		K_SHIFT,		-1,		-1,	-1},
+	{"+speed", 			"run / walk",		ID_SPEED,		ANIM_RUN,		K_LEFTSHIFT,	K_RIGHTSHIFT, -1, -1},
 	{"+forward", 		"walk forward",		ID_FORWARD,		ANIM_WALK,		K_UPARROW,		-1,		-1, -1},
 	{"+back", 			"backpedal",		ID_BACKPEDAL,	ANIM_BACK,		K_DOWNARROW,	-1,		-1, -1},
 	{"+moveleft", 		"step left",		ID_MOVELEFT,	ANIM_STEPLEFT,	',',			-1,		-1, -1},
@@ -278,7 +278,7 @@ static bind_t g_bindings[] =
 	{"+movedown",		"down / crouch",	ID_MOVEDOWN,	ANIM_CROUCH,	'c',			-1,		-1, -1},
 	{"+left", 			"turn left",		ID_LEFT,		ANIM_TURNLEFT,	K_LEFTARROW,	-1,		-1, -1},
 	{"+right", 			"turn right",		ID_RIGHT,		ANIM_TURNRIGHT,	K_RIGHTARROW,	-1,		-1, -1},
-	{"+strafe", 		"sidestep / turn",	ID_STRAFE,		ANIM_IDLE,		K_ALT,			-1,		-1, -1},
+	{"+strafe", 		"sidestep / turn",	ID_STRAFE,		ANIM_IDLE,		K_LEFTALT,		K_RIGHTALT, -1, -1},
 	{"+lookup", 		"look up",			ID_LOOKUP,		ANIM_LOOKUP,	K_PGDN,			-1,		-1, -1},
 	{"+lookdown", 		"look down",		ID_LOOKDOWN,	ANIM_LOOKDOWN,	K_DEL,			-1,		-1, -1},
 	{"+mlook", 			"mouse look",		ID_MOUSELOOK,	ANIM_IDLE,		'/',			-1,		-1, -1},
@@ -298,7 +298,7 @@ static bind_t g_bindings[] =
 	{"weapon 12",		"proximity mine",	ID_WEAPON12,	ANIM_WEAPON12,	-1,				-1,		-1, -1},
 	{"weapon 13",		"chain gun",		ID_WEAPON13,	ANIM_WEAPON13,	-1,				-1,		-1, -1},
 #endif
-	{"+attack", 		"attack",			ID_ATTACK,		ANIM_ATTACK,	K_CTRL,			-1,		-1, -1},
+	{"+attack", 		"attack",			ID_ATTACK,		ANIM_ATTACK,	K_LEFTCTRL,		K_RIGHTCTRL, -1, -1},
 	{"weapprev",		"previous weapon",	ID_WEAPPREV,	ANIM_IDLE,		'[',			-1,		-1, -1},
 	{"weapnext", 		"next weapon",		ID_WEAPNEXT,	ANIM_IDLE,		']',			-1,		-1, -1},
 	{"+button3", 		"gesture",			ID_GESTURE,		ANIM_GESTURE,	K_MOUSE3,		-1,		-1, -1},
diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
index 202c879a3..da0e59646 100644
--- a/code/ui/ui_shared.c
+++ b/code/ui/ui_shared.c
@@ -2162,13 +2162,13 @@ qboolean Item_TextField_HandleKey(itemDef_t *item, int key) {
 				return qtrue;
 			}
 
-			if ( key == K_HOME || key == K_KP_HOME) {// || ( tolower(key) == 'a' && trap_Key_IsDown( K_CTRL ) ) ) {
+			if ( key == K_HOME || key == K_KP_HOME) {// || ( tolower(key) == 'a' && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) ) {
 				item->cursorPos = 0;
 				editPtr->paintOffset = 0;
 				return qtrue;
 			}
 
-			if ( key == K_END || key == K_KP_END)  {// ( tolower(key) == 'e' && trap_Key_IsDown( K_CTRL ) ) ) {
+			if ( key == K_END || key == K_KP_END)  {// ( tolower(key) == 'e' && ( trap_Key_IsDown( K_LEFTCTRL ) || trap_Key_IsDown( K_RIGHTCTRL ) ) ) ) {
 				item->cursorPos = len;
 				if(item->cursorPos > editPtr->maxPaintChars) {
 					editPtr->paintOffset = len - editPtr->maxPaintChars;
@@ -3235,7 +3235,7 @@ static bind_t g_bindings[] =
 {
 	{"+scores",			 K_TAB,				-1,		-1, -1},
 	{"+button2",		 K_ENTER,			-1,		-1, -1},
-	{"+speed", 			 K_SHIFT,			-1,		-1,	-1},
+	{"+speed", 			 K_LEFTSHIFT,	K_RIGHTSHIFT, -1, -1},
 	{"+forward", 		 K_UPARROW,		-1,		-1, -1},
 	{"+back", 			 K_DOWNARROW,	-1,		-1, -1},
 	{"+moveleft", 	 ',',					-1,		-1, -1},
@@ -3244,7 +3244,7 @@ static bind_t g_bindings[] =
 	{"+movedown",		 'c',					-1,		-1, -1},
 	{"+left", 			 K_LEFTARROW,	-1,		-1, -1},
 	{"+right", 			 K_RIGHTARROW,	-1,		-1, -1},
-	{"+strafe", 		 K_ALT,				-1,		-1, -1},
+	{"+strafe", 		 K_LEFTALT,		K_RIGHTALT, -1, -1},
 	{"+lookup", 		 K_PGDN,				-1,		-1, -1},
 	{"+lookdown", 	 K_DEL,				-1,		-1, -1},
 	{"+mlook", 			 '/',					-1,		-1, -1},
@@ -3263,7 +3263,7 @@ static bind_t g_bindings[] =
 	{"weapon 11",		 -1,					-1,		-1, -1},
 	{"weapon 12",		 -1,					-1,		-1, -1},
 	{"weapon 13",		 -1,					-1,		-1, -1},
-	{"+attack", 		 K_CTRL,				-1,		-1, -1},
+	{"+attack", 		 K_LEFTCTRL,	K_RIGHTCTRL,		-1, -1},
 	{"weapprev",		 '[',					-1,		-1, -1},
 	{"weapnext", 		 ']',					-1,		-1, -1},
 	{"+button3", 		 K_MOUSE3,			-1,		-1, -1},

From 8710cb30fde0b4c3f654452fb2dca55b92750d0c Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 27 Sep 2018 22:05:51 -0500
Subject: [PATCH 36/42] mint-arena: Add trap_Cvar_DefaultVariableStringBuffer

---
 code/cgame/cg_public.h   | 1 +
 code/cgame/cg_syscalls.c | 4 ++++
 code/game/bg_public.h    | 1 +
 code/game/g_public.h     | 1 +
 code/game/g_syscalls.c   | 4 ++++
 5 files changed, 11 insertions(+)

diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index b9c94b558..a54381c7e 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -208,6 +208,7 @@ typedef enum {
 	CG_CVAR_VARIABLE_INTEGER_VALUE,
 	CG_CVAR_VARIABLE_STRING_BUFFER,
 	CG_CVAR_LATCHED_VARIABLE_STRING_BUFFER,
+	CG_CVAR_DEFAULT_VARIABLE_STRING_BUFFER,
 	CG_CVAR_INFO_STRING_BUFFER,
 	CG_CVAR_CHECK_RANGE,
 
diff --git a/code/cgame/cg_syscalls.c b/code/cgame/cg_syscalls.c
index 98e3dd5c2..364f6333d 100644
--- a/code/cgame/cg_syscalls.c
+++ b/code/cgame/cg_syscalls.c
@@ -105,6 +105,10 @@ void trap_Cvar_LatchedVariableStringBuffer( const char *var_name, char *buffer,
 	syscall( CG_CVAR_LATCHED_VARIABLE_STRING_BUFFER, var_name, buffer, bufsize );
 }
 
+void trap_Cvar_DefaultVariableStringBuffer( const char *var_name, char *buffer, int bufsize ) {
+	syscall( CG_CVAR_DEFAULT_VARIABLE_STRING_BUFFER, var_name, buffer, bufsize );
+}
+
 void	trap_Cvar_InfoStringBuffer( int bit, char *buffer, int bufsize ) {
 	syscall( CG_CVAR_INFO_STRING_BUFFER, bit, buffer, bufsize );
 }
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index cd5426871..3104880bd 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -1328,6 +1328,7 @@ int		trap_Cvar_VariableIntegerValue( const char *var_name );
 float	trap_Cvar_VariableValue( const char *var_name );
 void	trap_Cvar_VariableStringBuffer( const char *var_name, char *buffer, int bufsize );
 void	trap_Cvar_LatchedVariableStringBuffer( const char *var_name, char *buffer, int bufsize );
+void	trap_Cvar_DefaultVariableStringBuffer( const char *var_name, char *buffer, int bufsize );
 void	trap_Cvar_InfoStringBuffer( int bit, char *buffer, int bufsize );
 void	trap_Cvar_CheckRange( const char *var_name, float min, float max, qboolean integral );
 
diff --git a/code/game/g_public.h b/code/game/g_public.h
index 685547eff..704608cf6 100644
--- a/code/game/g_public.h
+++ b/code/game/g_public.h
@@ -154,6 +154,7 @@ typedef enum {
 	G_CVAR_VARIABLE_INTEGER_VALUE,			// ( const char *var_name );
 	G_CVAR_VARIABLE_STRING_BUFFER,			// ( const char *var_name, char *buffer, int bufsize );
 	G_CVAR_LATCHED_VARIABLE_STRING_BUFFER,	// ( const char *var_name, char *buffer, int bufsize );
+	G_CVAR_DEFAULT_VARIABLE_STRING_BUFFER,	// ( const char *var_name, char *buffer, int bufsize );
 	G_CVAR_INFO_STRING_BUFFER,				// ( int bit, char *buffer, int bufsize );
 	G_CVAR_CHECK_RANGE,						// (  const char *var_name, float min, float max, qboolean integral );
 
diff --git a/code/game/g_syscalls.c b/code/game/g_syscalls.c
index bf40b9005..90ce1723e 100644
--- a/code/game/g_syscalls.c
+++ b/code/game/g_syscalls.c
@@ -150,6 +150,10 @@ void trap_Cvar_LatchedVariableStringBuffer( const char *var_name, char *buffer,
 	syscall( G_CVAR_LATCHED_VARIABLE_STRING_BUFFER, var_name, buffer, bufsize );
 }
 
+void trap_Cvar_DefaultVariableStringBuffer( const char *var_name, char *buffer, int bufsize ) {
+	syscall( G_CVAR_DEFAULT_VARIABLE_STRING_BUFFER, var_name, buffer, bufsize );
+}
+
 void trap_Cvar_InfoStringBuffer( int bit, char *buffer, int bufsize ) {
 	syscall( G_CVAR_INFO_STRING_BUFFER, bit, buffer, bufsize );
 }

From 23694d575f62ceccd270571655de72714dbb059f Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 27 Sep 2018 22:20:17 -0500
Subject: [PATCH 37/42] mint-arena: Remove g_configcvars from ui_controls2.c

Use trap_Cvar_DefaultVariableStringBuffer() instead of resetting
the variable to get the default value.
---
 code/q3_ui/ui_controls2.c | 97 ++-------------------------------------
 code/ui/ui_shared.c       |  7 ---
 2 files changed, 4 insertions(+), 100 deletions(-)

diff --git a/code/q3_ui/ui_controls2.c b/code/q3_ui/ui_controls2.c
index b063d353a..b5a9f3e82 100644
--- a/code/q3_ui/ui_controls2.c
+++ b/code/q3_ui/ui_controls2.c
@@ -56,13 +56,6 @@ typedef struct {
 	int		bind2;
 } bind_t;
 
-typedef struct
-{
-	char*	name;
-	float	defaultvalue;
-	float	value;	
-} configcvar_t;
-
 #define SAVE_NOOP		0
 #define SAVE_YES		1
 #define SAVE_NO			2
@@ -452,35 +445,6 @@ bind_t *g_bindings_list[MAX_SPLITVIEW] =
 	g_bindings4
 };
 
-static configcvar_t g_configcvars[] =
-{
-	{"cl_run",			0,					0},
-	{"2cl_run",			0,					0},
-	{"3cl_run",			0,					0},
-	{"4cl_run",			0,					0},
-	{"m_pitch",			0,					0},
-	{"cg_cyclePastGauntlet",0,				0},
-	{"2cg_cyclePastGauntlet",0,				0},
-	{"3cg_cyclePastGauntlet",0,				0},
-	{"4cg_cyclePastGauntlet",0,				0},
-	{"cg_autoswitch",	0,					0},
-	{"2cg_autoswitch",	0,					0},
-	{"3cg_autoswitch",	0,					0},
-	{"4cg_autoswitch",	0,					0},
-	{"sensitivity",		0,					0},
-	{"in_joystickUseAnalog",	0,			0},
-	{"2in_joystickUseAnalog",	0,			0},
-	{"3in_joystickUseAnalog",	0,			0},
-	{"4in_joystickUseAnalog",	0,			0},
-	{"in_joystickThreshold",	0,			0},
-	{"2in_joystickThreshold",	0,			0},
-	{"3in_joystickThreshold",	0,			0},
-	{"4in_joystickThreshold",	0,			0},
-	{"m_filter",		0,					0},
-	{"cl_freelook",		0,					0},
-	{NULL,				0,					0}
-};
-
 static menucommon_s *g_movement_controls[] =
 {
 	(menucommon_s *)&s_controls.alwaysrun,     
@@ -602,34 +566,6 @@ static menucommon_s **g_mini_controls[] = {
 	NULL
 };
 
-/*
-=================
-Controls_InitCvars
-=================
-*/
-static void Controls_InitCvars( void )
-{
-	int				i;
-	configcvar_t*	cvarptr;
-
-	cvarptr = g_configcvars;
-	for (i=0; ;i++,cvarptr++)
-	{
-		if (!cvarptr->name)
-			break;
-
-		// get current value
-		cvarptr->value = trap_Cvar_VariableValue( cvarptr->name );
-
-		// get default value
-		trap_Cvar_Reset( cvarptr->name );
-		cvarptr->defaultvalue = trap_Cvar_VariableValue( cvarptr->name );
-
-		// restore current value
-		trap_Cvar_SetValue( cvarptr->name, cvarptr->value );
-	}
-}
-
 /*
 =================
 Controls_GetCvarDefault
@@ -637,20 +573,11 @@ Controls_GetCvarDefault
 */
 static float Controls_GetCvarDefault( char* name )
 {
-	configcvar_t*	cvarptr;
-	int				i;
+	char defaultvaluebuf[MAX_CVAR_VALUE_STRING];
 
-	cvarptr = g_configcvars;
-	for (i=0; ;i++,cvarptr++)
-	{
-		if (!cvarptr->name)
-			return (0);
-
-		if (!strcmp(cvarptr->name,name))
-			break;
-	}
+	trap_Cvar_DefaultVariableStringBuffer( name, defaultvaluebuf, sizeof( defaultvaluebuf ) );
 
-	return (cvarptr->defaultvalue);
+	return atof( defaultvaluebuf );
 }
 
 /*
@@ -660,20 +587,7 @@ Controls_GetCvarValue
 */
 static float Controls_GetCvarValue( char* name )
 {
-	configcvar_t*	cvarptr;
-	int				i;
-
-	cvarptr = g_configcvars;
-	for (i=0; ;i++,cvarptr++)
-	{
-		if (!cvarptr->name)
-			return (0);
-
-		if (!strcmp(cvarptr->name,name))
-			break;
-	}
-
-	return (cvarptr->value);
+	return trap_Cvar_VariableValue( name );
 }
 
 
@@ -2102,9 +2016,6 @@ static void Controls_MenuInit( int localPlayerNum )
 	trap_Cvar_VariableStringBuffer( Com_LocalPlayerCvarName(s_controls.localPlayerNum, "name"), s_controls.name.string, 16 );
 	Q_CleanStr( s_controls.name.string );
 
-	// initialize the configurable cvars
-	Controls_InitCvars();
-
 	// initialize the current config
 	Controls_GetConfig();
 
diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
index da0e59646..275eb1557 100644
--- a/code/ui/ui_shared.c
+++ b/code/ui/ui_shared.c
@@ -3223,13 +3223,6 @@ typedef struct {
 	int		bind2;
 } bind_t;
 
-typedef struct
-{
-	char*	name;
-	float	defaultvalue;
-	float	value;	
-} configcvar_t;
-
 
 static bind_t g_bindings[] = 
 {

From c428f151c1f4f5cc9a7812636b78e71d4b57be6d Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 8 Oct 2018 00:39:47 -0500
Subject: [PATCH 38/42] mint-arena: Fix bot console message queue reaching
 limit on map change

On map change there are two console messages for each player. "X entered
the game". "X joined the red team". However a bot may ask who the team
leader is which will require the bot console message queue to be at
least 129 console messages (currently 128).

Increase bot console message queue to 196.
---
 code/game/ai_chat_sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/ai_chat_sys.c b/code/game/ai_chat_sys.c
index 7bf7fa4e2..9bef9534f 100644
--- a/code/game/ai_chat_sys.c
+++ b/code/game/ai_chat_sys.c
@@ -193,8 +193,8 @@ typedef struct bot_stringlist_s
 	struct bot_stringlist_s *next;
 } bot_stringlist_t;
 
-//may use up to MAX_CLIENTS * 2 console messages on map change
-#define MAX_CHATSTATE_MESSAGES 128
+//may use up to MAX_CLIENTS * 2 console messages plus a few chat messages on map change
+#define MAX_CHATSTATE_MESSAGES ( MAX_CLIENTS * 3 )
 
 //chat state of a bot
 typedef struct bot_chatstate_s

From d289c4dcc37cf2317201c1650978ff86eeed23de Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Mon, 8 Oct 2018 04:41:24 -0500
Subject: [PATCH 39/42] mint-arena: Define NDEBUG in release QVMs

Removes -debug from gameversion cvar value.
---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9c336a1d8..8eac74de6 100644
--- a/Makefile
+++ b/Makefile
@@ -778,13 +778,13 @@ debug:
 	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(BASE_BUILD_DEFINES) $(BASE_CFLAGS) $(BUILD_DEFINES) $(DEPEND_CFLAGS)" \
 	  OPTIMIZE="$(DEBUG_CFLAGS)" OPTIMIZEVM="$(DEBUG_CFLAGS)" \
 	  CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V) \
-	  BUILD_DEFINES="$(BASE_BUILD_DEFINES) $(BUILD_DEFINES)"
+	  QVM_CFLAGS="$(BASE_BUILD_DEFINES) $(BUILD_DEFINES)"
 
 release:
 	@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(BASE_BUILD_DEFINES) $(BASE_CFLAGS) $(BUILD_DEFINES) $(DEPEND_CFLAGS)" \
 	  OPTIMIZE="-DNDEBUG $(OPTIMIZE)" OPTIMIZEVM="-DNDEBUG $(OPTIMIZEVM)" \
 	  CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V) \
-	  BUILD_DEFINES="$(BASE_BUILD_DEFINES) $(BUILD_DEFINES)"
+	  QVM_CFLAGS="-DNDEBUG $(BASE_BUILD_DEFINES) $(BUILD_DEFINES)"
 
 ifneq ($(call bin_path, tput),)
   TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi)
@@ -1005,32 +1005,32 @@ $(Q3LCC): $(Q3LCCOBJ) $(Q3RCC) $(Q3CPP)
 
 define DO_Q3LCC
 $(echo_cmd) "Q3LCC $<"
-$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) $(BUILD_DEFINES) -o $@ $<
+$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) $(QVM_CFLAGS) -o $@ $<
 endef
 
 define DO_CGAME_Q3LCC
 $(echo_cmd) "CGAME_Q3LCC $<"
-$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DCGAME $(BUILD_DEFINES) -o $@ $<
+$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DCGAME $(QVM_CFLAGS) -o $@ $<
 endef
 
 define DO_GAME_Q3LCC
 $(echo_cmd) "GAME_Q3LCC $<"
-$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DGAME $(BUILD_DEFINES) -o $@ $<
+$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DGAME $(QVM_CFLAGS) -o $@ $<
 endef
 
 define DO_Q3LCC_MISSIONPACK
 $(echo_cmd) "Q3LCC_MISSIONPACK $<"
-$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) $(BUILD_DEFINES) -o $@ $<
+$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) $(QVM_CFLAGS) -o $@ $<
 endef
 
 define DO_CGAME_Q3LCC_MISSIONPACK
 $(echo_cmd) "CGAME_Q3LCC_MISSIONPACK $<"
-$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DCGAME $(BUILD_DEFINES) -o $@ $<
+$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DCGAME $(QVM_CFLAGS) -o $@ $<
 endef
 
 define DO_GAME_Q3LCC_MISSIONPACK
 $(echo_cmd) "GAME_Q3LCC_MISSIONPACK $<"
-$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DGAME $(BUILD_DEFINES) -o $@ $<
+$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DGAME $(QVM_CFLAGS) -o $@ $<
 endef
 
 

From 046d3119a73931d2748edcfe48074eaeeaac3cd5 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Wed, 10 Oct 2018 04:44:33 -0500
Subject: [PATCH 40/42] mint-arena: Change version to 1.0.0

---
 Makefile               | 2 +-
 code/cgame/cg_public.h | 6 ++++--
 code/game/bg_public.h  | 2 +-
 code/game/g_public.h   | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index b3073d0ed..04efe32a6 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.0-devil
+VERSION=1.0.0
 endif
 
 ifndef VM_PREFIX
diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index a54381c7e..41a3f278c 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -35,8 +35,10 @@ Suite 120, Rockville, Maryland 20850 USA.
 
 // major 0 means each minor is an API break.
 // major > 0 means each major is an API break and each minor extends API.
-#define CG_API_MAJOR_VERSION	0
-#define CG_API_MINOR_VERSION	39
+// ZTM: FIXME: There is no way for the VM to know what the engine support API is
+//             so there is no way to add more system calls.
+#define CG_API_MAJOR_VERSION	1
+#define CG_API_MINOR_VERSION	0
 
 
 #define	CMD_BACKUP			64	
diff --git a/code/game/bg_public.h b/code/game/bg_public.h
index 3104880bd..2a7526e50 100644
--- a/code/game/bg_public.h
+++ b/code/game/bg_public.h
@@ -44,7 +44,7 @@ Suite 120, Rockville, Maryland 20850 USA.
 
 // Keep this in-sync with VERSION in Makefile.
 #ifndef PRODUCT_VERSION
-	#define PRODUCT_VERSION			"1.0-devil"
+	#define PRODUCT_VERSION			"1.0.0"
 #endif
 
 // because games can change separately from the main system protocol, we need a
diff --git a/code/game/g_public.h b/code/game/g_public.h
index 704608cf6..8122a1646 100644
--- a/code/game/g_public.h
+++ b/code/game/g_public.h
@@ -35,8 +35,10 @@ Suite 120, Rockville, Maryland 20850 USA.
 
 // major 0 means each minor is an API break.
 // major > 0 means each major is an API break and each minor extends API.
-#define	GAME_API_MAJOR_VERSION	0
-#define	GAME_API_MINOR_VERSION	16
+// ZTM: FIXME: There is no way for the VM to know what the engine support API is
+//             so there is no way to add more system calls.
+#define	GAME_API_MAJOR_VERSION	1
+#define	GAME_API_MINOR_VERSION	0
 
 
 // entity->svFlags

From f5b407f5774f12db442f95dbc8600f2c17dbe55a Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 13 Oct 2018 01:23:05 -0500
Subject: [PATCH 41/42] mint-arena: Fix drawing Team Arena team info for
 'everyone'

Text_Paint_Limit() used max X in global screen instead of current screen
placement. This resulted in name and location in center screen placement
Team Arena team info for list of players being completely cut off in
widescreen.
---
 code/cgame/cg_text.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/cgame/cg_text.c b/code/cgame/cg_text.c
index 6e5ccaabb..89c46e1ea 100644
--- a/code/cgame/cg_text.c
+++ b/code/cgame/cg_text.c
@@ -542,7 +542,7 @@ void Text_Paint_Limit( float *maxX, float x, float y, const fontInfo_t *font, fl
 	vec4_t newColor;
 	const glyphInfo_t *glyph;
 	const char *s;
-	float max;
+	float start, max;
 	float yadj, xadj;
 	float useScaleX, useScaleY;
 	float xscale, yscale;
@@ -553,10 +553,11 @@ void Text_Paint_Limit( float *maxX, float x, float y, const fontInfo_t *font, fl
 
 	xscale = 1.0f;
 	yscale = 1.0f;
+	start = 0.0f;
+	max = *maxX;
 	CG_AdjustFrom640( &x, &y, &xscale, &yscale );
-
-	max = *maxX * xscale;
-	adjust *= xscale;
+	CG_AdjustFrom640( &start, NULL, &adjust, NULL );
+	CG_AdjustFrom640( &max, NULL, NULL, NULL );
 
 	useScaleX = scale * font->glyphScale * xscale;
 	useScaleY = scale * font->glyphScale * yscale;
@@ -590,7 +591,7 @@ void Text_Paint_Limit( float *maxX, float x, float y, const fontInfo_t *font, fl
 		glyph = Text_GetGlyph( font, Q_UTF8_CodePoint( &s ) );
 
 		if ( x + ( glyph->xSkip * useScaleX ) > max ) {
-			*maxX = 0;
+			x = start;
 			break;
 		}
 
@@ -599,10 +600,12 @@ void Text_Paint_Limit( float *maxX, float x, float y, const fontInfo_t *font, fl
 
 		Text_PaintGlyph( x + xadj, y - yadj, glyph->imageWidth * useScaleX, glyph->imageHeight * useScaleY, glyph, NULL );
 		x += ( glyph->xSkip * useScaleX ) + adjust;
-		*maxX = x / xscale;
 		count++;
 	}
 	trap_R_SetColor( NULL );
+
+	// convert X to 640 coords
+	*maxX = ( x - start ) / xscale;
 }
 
 #define MAX_WRAP_BYTES 1024

From 89e27ff66ebce719308d30a64362246e0af6b6bb Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 13 Oct 2018 02:35:25 -0500
Subject: [PATCH 42/42] mint-arena: Fix loadhud command not applying hud menu
 hacks

Using loadhud command to reload HUD (instead of vid_restart) resulted
in menu hacks not being applied to fix voice menu and power up area
screen placement for widescreen.
---
 code/cgame/cg_consolecmds.c |  1 +
 code/cgame/cg_local.h       |  1 +
 code/cgame/cg_main.c        | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 449f9aa0b..7f0408975 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -585,6 +585,7 @@ static void CG_LoadHud_f( void) {
 	}
 
 	CG_LoadMenus(hudSet);
+	CG_HudMenuHacks();
   menuScoreboard = NULL;
 }
 
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index a0836b071..f5a04937d 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -1515,6 +1515,7 @@ void CG_UpdateCvars( void );
 int CG_CrosshairPlayer( int localPlayerNum );
 int CG_LastAttacker( int localPlayerNum );
 void CG_LoadMenus(const char *menuFile);
+void CG_HudMenuHacks( void );
 void CG_DistributeKeyEvent( int key, qboolean down, unsigned time, connstate_t state, int joystickNum, int axisNum );
 void CG_DistributeCharEvent( int key, connstate_t state );
 void CG_KeyEvent(int key, qboolean down);
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index e1855391b..8edb00c0e 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -2447,7 +2447,6 @@ CG_LoadHudMenu();
 void CG_LoadHudMenu( void ) {
 	char buff[1024];
 	const char *hudSet;
-	menuDef_t *menu;
 
 	cgDC.registerShaderNoMip = &trap_R_RegisterShaderNoMip;
 	cgDC.setColor = &trap_R_SetColor;
@@ -2514,6 +2513,18 @@ void CG_LoadHudMenu( void ) {
 	}
 
 	CG_LoadMenus(hudSet);
+	CG_HudMenuHacks();
+}
+
+/*
+=================
+CG_HudMenuHacks
+=================
+*/
+void CG_HudMenuHacks( void ) {
+	menuDef_t *menu;
+
+	Init_Display(&cgDC);
 
 	// make voice chat head stick to left side in widescreen
 	menu = Menus_FindByName( "voiceMenu" );