Index: code/game/bg_public.h
===================================================================
--- code/game/bg_public.h	(revision 1797)
+++ code/game/bg_public.h	(working copy)
@@ -103,10 +103,10 @@
 
 	GT_TEAM,			// team deathmatch
 	GT_CTF,				// capture the flag
-	GT_MAX_GAME_TYPE,		// other gametypes haven't been implemented.
 	GT_1FCTF,
 	GT_OBELISK,
-	GT_HARVESTER
+	GT_HARVESTER,
+	GT_MAX_GAME_TYPE
 } gametype_t;
 
 typedef enum { GENDER_MALE, GENDER_FEMALE, GENDER_NEUTER } gender_t;
Index: code/q3_ui/ui_startserver.c
===================================================================
--- code/q3_ui/ui_startserver.c	(revision 1797)
+++ code/q3_ui/ui_startserver.c	(working copy)
@@ -1239,7 +1239,8 @@
 
 	memset( &s_serveroptions, 0 ,sizeof(serveroptions_t) );
 	s_serveroptions.multiplayer = multiplayer;
-	s_serveroptions.gametype = (int)Com_Clamp( 0, GT_MAX_GAME_TYPE - 1, trap_Cvar_VariableValue( "g_gameType" ) );
+	s_serveroptions.gametype = (int)Com_Clamp( 0, ARRAY_LEN(gametype_remap2) - 1,
+trap_Cvar_VariableValue( "g_gametype" ) );
 	s_serveroptions.punkbuster.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "sv_punkbuster" ) );
 
 	ServerOptions_Cache();