From 72ad2fbc7299c9a688796d2c5b1b3c1b24e6b88c Mon Sep 17 00:00:00 2001
From: dolcetriade <vcelestialragev@gmail.com>
Date: Mon, 27 Feb 2012 11:51:50 -0800
Subject: [PATCH 1/4] Fix ping not showing up in connect menu

---
 src/engine/client/ui_api.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/engine/client/ui_api.h b/src/engine/client/ui_api.h
index 3b5788f..e3c70a7 100644
--- a/src/engine/client/ui_api.h
+++ b/src/engine/client/ui_api.h
@@ -196,10 +196,10 @@ typedef enum {
 	SORT_HOST,
 	SORT_MAP,
 	SORT_CLIENTS,
+	SORT_PING,
 	SORT_GAME,
 	SORT_FILTERS,
-	SORT_FAVOURITES,
-	SORT_PING
+	SORT_FAVOURITES
 } serverSortField_t;

 typedef enum
--
1.7.9.1


From d0d46783e7101d97ec5a8400378032e514bfd5f2 Mon Sep 17 00:00:00 2001
From: dolcetriade <vcelestialragev@gmail.com>
Date: Mon, 27 Feb 2012 11:52:29 -0800
Subject: [PATCH 2/4] Print "main" for gametype when running default gametype.

---
 src/gamelogic/gpp/src/ui/ui_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gamelogic/gpp/src/ui/ui_main.c b/src/gamelogic/gpp/src/ui/ui_main.c
index 9e3affe..6422546 100644
--- a/src/gamelogic/gpp/src/ui/ui_main.c
+++ b/src/gamelogic/gpp/src/ui/ui_main.c
@@ -3951,7 +3951,7 @@ static const char *UI_FeederItemText( int feederID, int index, int column, qhand
           }

         case SORT_GAME:
-          return Info_ValueForKey( info, "game" );
+          return Info_ValueForKey( info, "game" )[0] ? Info_ValueForKey( info, "game" ) : "main";

         case SORT_MAP:
           return Info_ValueForKey( info, "mapname" );
--
1.7.9.1


From 0bce5ef64f87324a71325e4daa937f97951f39e9 Mon Sep 17 00:00:00 2001
From: dolcetriade <vcelestialragev@gmail.com>
Date: Mon, 27 Feb 2012 12:28:38 -0800
Subject: [PATCH 3/4] Set modelscale to 1 by default

---
 src/gamelogic/gpp/src/cgame/cg_weapons.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gamelogic/gpp/src/cgame/cg_weapons.c b/src/gamelogic/gpp/src/cgame/cg_weapons.c
index 5bfda37..de71bcc 100644
--- a/src/gamelogic/gpp/src/cgame/cg_weapons.c
+++ b/src/gamelogic/gpp/src/cgame/cg_weapons.c
@@ -499,7 +499,8 @@ static qboolean CG_ParseWeaponFile( const char *filename, weaponInfo_t *wi )
   trap_FS_Read( text, len, f );
   text[ len ] = 0;
   trap_FS_FCloseFile( f );
-
+  for( i=0;i<3;i++ )
+    wi->scale[i] = 1.0;
   // parse the text
   text_p = text;

--
1.7.9.1


From e9b5810008ac1b032f30c165d8f42edf73a3da05 Mon Sep 17 00:00:00 2001
From: dolcetriade <vcelestialragev@gmail.com>
Date: Mon, 27 Feb 2012 14:47:39 -0800
Subject: [PATCH 4/4] Update globalservers to allow Featured/Official servers

---
 src/engine/client/cl_main.c |   81 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/src/engine/client/cl_main.c b/src/engine/client/cl_main.c
index 395ea62..4b52a7e 100644
--- a/src/engine/client/cl_main.c
+++ b/src/engine/client/cl_main.c
@@ -3313,13 +3313,20 @@ void CL_ServersResponsePacket( const netadr_t* from, msg_t *msg, qboolean extend
 	buffend    = buffptr + msg->cursize;

 	// advance to initial token
-	do
+	// skip header
+	buffptr += 4;
+
+	// advance to initial token
+	// I considered using strchr for this but I don't feel like relying
+	// on its behaviour with '\0'
+	while( *buffptr && *buffptr != '\\' && *buffptr != '/' )
 	{
-		if(*buffptr == '\\' || (extended && *buffptr == '/'))
-			break;
-
 		buffptr++;
-	} while (buffptr < buffend);
+
+		if( buffptr+1 >= buffend )
+			break;
+	}
+


 	if( *buffptr == '\0' )
@@ -5818,6 +5825,68 @@ CL_GlobalServers_f
 ==================
 */
 void CL_GlobalServers_f( void ) {
+	netadr_t	to;
+	int			count, i, masterNum;
+	char		command[1024], *masteraddress;
+	int protocol = atoi( Cmd_Argv(2) ); // Do this right away, otherwise weird things happen when you use the ingame "Get New Servers" button.
+
+	if ((count = Cmd_Argc()) < 2 || (masterNum = atoi(Cmd_Argv(1))) < 0 || masterNum > MAX_MASTER_SERVERS - 1)
+	{
+		Com_Printf("usage: globalservers <master# 0-%d> [protocol] [keywords]\n", MAX_MASTER_SERVERS - 1);
+		return;
+	}
+
+	sprintf(command, "sv_master%d", masterNum + 1);
+	masteraddress = Cvar_VariableString(command);
+
+	if(!*masteraddress)
+	{
+		Com_Printf( "CL_GlobalServers_f: Error: No master server address given.\n");
+		return;
+	}
+
+	// reset the list, waiting for response
+	// -1 is used to distinguish a "no response"
+
+	i = NET_StringToAdr(masteraddress, &to, NA_UNSPEC);
+
+	if(!i)
+	{
+		Com_Printf( "CL_GlobalServers_f: Error: could not resolve address of master %s\n", masteraddress);
+		return;
+	}
+	else if(i == 2)
+		to.port = BigShort(PORT_MASTER);
+
+	Com_Printf("Requesting servers from master %s...\n", masteraddress);
+
+	cls.numglobalservers = -1;
+	cls.pingUpdateSource = AS_GLOBAL;
+
+	Com_sprintf( command, sizeof( command ), "getserversExt %s %d",
+                     cl_gamename->string, protocol );
+	// TODO: test if we only have IPv4/IPv6, if so request only the relevant
+	// servers with getserversExt %s %d ipvX
+	// not that big a deal since the extra servers won't respond to getinfo
+	// anyway.
+
+	for (i=3; i < count; i++)
+	{
+		Q_strcat(command, sizeof(command), " ");
+		Q_strcat(command, sizeof(command), Cmd_Argv(i));
+	}
+
+	NET_OutOfBandPrint( NS_SERVER, to, "%s", command );
+	CL_RequestMotd();
+}
+
+#if 0
+/*
+==================
+CL_GlobalServers_f
+==================
+*/
+void CL_GlobalServers_f( void ) {
     netadr_t    to;
     int         count, i, masterNum;
     char        command[1024], *masteraddress;
@@ -5883,7 +5952,7 @@ void CL_GlobalServers_f( void ) {

     NET_OutOfBandPrint( NS_SERVER, to, "%s", command );
 }
-
+#endif

 /*
 ==================
--
1.7.9.1