[quake3-commits] r2318 - trunk/code/q3_ui

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-09-17 00:16:30 -0400 (Mon, 17 Sep 2012)
New Revision: 2318

Modified:
   trunk/code/q3_ui/ui_servers2.c
Log:
Cache servers for each master server in q3_ui, otherwise servers from last updated master for shown for all Internet# sources.

Modified: trunk/code/q3_ui/ui_servers2.c
===================================================================
--- trunk/code/q3_ui/ui_servers2.c	2012-09-10 01:22:13 UTC (rev 2317)
+++ trunk/code/q3_ui/ui_servers2.c	2012-09-17 04:16:30 UTC (rev 2318)
@@ -88,6 +88,8 @@
 #define UIAS_GLOBAL5			5
 #define UIAS_FAVORITES			6
 
+#define UI_MAX_MASTER_SERVERS	5
+
 #define SORT_HOST			0
 #define SORT_MAP			1
 #define SORT_CLIENTS		2
@@ -242,8 +244,8 @@
 static arenaservers_t	g_arenaservers;
 
 
-static servernode_t		g_globalserverlist[MAX_GLOBALSERVERS];
-static int				g_numglobalservers;
+static servernode_t		g_globalserverlist[UI_MAX_MASTER_SERVERS][MAX_GLOBALSERVERS];
+static int				g_numglobalservers[UI_MAX_MASTER_SERVERS];
 static servernode_t		g_localserverlist[MAX_LOCALSERVERS];
 static int				g_numlocalservers;
 static servernode_t		g_favoriteserverlist[MAX_FAVORITESERVERS];
@@ -1156,8 +1158,8 @@
 	case UIAS_GLOBAL4:
 	case UIAS_GLOBAL5:
 		g_arenaservers.remove.generic.flags |= (QMF_INACTIVE|QMF_HIDDEN);
-		g_arenaservers.serverlist = g_globalserverlist;
-		g_arenaservers.numservers = &g_numglobalservers;
+		g_arenaservers.serverlist = g_globalserverlist[type-UIAS_GLOBAL1];
+		g_arenaservers.numservers = &g_numglobalservers[type-UIAS_GLOBAL1];
 		g_arenaservers.maxservers = MAX_GLOBALSERVERS;
 		break;