From 8bdd8e6705cd40b4a1d800f67516999fd3a5b1e9 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Fri, 4 Mar 2011 20:23:29 +0000 Subject: [PATCH] (#4918) Gametype clamping using constant integer in missionpack ui, by Zack Middleton --- code/ui/ui_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c index 1972a932..7a500feb 100644 --- a/code/ui/ui_main.c +++ b/code/ui/ui_main.c @@ -2776,7 +2776,7 @@ static void UI_StartSinglePlayer(void) { } trap_Cvar_SetValue( "singleplayer", 1 ); - trap_Cvar_SetValue( "g_gametype", Com_Clamp( 0, 7, tierList[i].gameTypes[j] ) ); + trap_Cvar_SetValue( "g_gametype", Com_Clamp( 0, GT_MAX_GAME_TYPE-1, tierList[i].gameTypes[j] ) ); trap_Cmd_ExecuteText( EXEC_APPEND, va( "wait ; wait ; map %s\n", tierList[i].maps[j] ) ); skill = trap_Cvar_VariableValue( "g_spSkill" ); @@ -3160,7 +3160,7 @@ static void UI_RunMenuScript(char **args) { trap_Cvar_Set("cg_cameraOrbit", "0"); trap_Cvar_Set("ui_singlePlayerActive", "0"); trap_Cvar_SetValue( "dedicated", Com_Clamp( 0, 2, ui_dedicated.integer ) ); - trap_Cvar_SetValue( "g_gametype", Com_Clamp( 0, 8, uiInfo.gameTypes[ui_netGameType.integer].gtEnum ) ); + trap_Cvar_SetValue( "g_gametype", Com_Clamp( 0, GT_MAX_GAME_TYPE-1, uiInfo.gameTypes[ui_netGameType.integer].gtEnum ) ); trap_Cvar_Set("g_redTeam", UI_Cvar_VariableString("ui_teamName")); trap_Cvar_Set("g_blueTeam", UI_Cvar_VariableString("ui_opponentName")); trap_Cmd_ExecuteText( EXEC_APPEND, va( "wait ; wait ; map %s\n", uiInfo.mapList[ui_currentNetMap.integer].mapLoadName ) );