Fix loading favorites as initial source in server browser

zturtleman · zturtleman · commit 64733d6b31cb · 2018-08-28T21:45:28.000-05:00
When I added UIAS_GLOBAL0 in 2017 I missed changing ui_browserMaster
range clamp from 6 to 7.

Reported by cdev-tux.
diff --git 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 );
