r1471 - in trunk/code: client qcommon server

[DONOTREPLY at icculus.org]

Author: tma
Date: 2008-09-15 16:24:04 -0400 (Mon, 15 Sep 2008)
New Revision: 1471

Modified:
   trunk/code/client/cl_main.c
   trunk/code/qcommon/q_shared.h
   trunk/code/server/sv_main.c
Log:
* Supply specific identifier to the master server (Mathieu Olivier)


Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c	2008-09-05 23:38:35 UTC (rev 1470)
+++ trunk/code/client/cl_main.c	2008-09-15 20:24:04 UTC (rev 1471)
@@ -3666,7 +3666,7 @@
 	// Use the extended query for IPv6 masters
 	if (to.type == NA_IP6 || to.type == NA_MULTICAST6)
 	{
-		cmdname = "getserversExt " GAMENAME;
+		cmdname = "getserversExt " GAMENAME_FOR_MASTER;
 
 		// TODO: test if we only have an IPv6 connection. If it's the case,
 		//       request IPv6 servers only by appending " ipv6" to the command

Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2008-09-05 23:38:35 UTC (rev 1470)
+++ trunk/code/qcommon/q_shared.h	2008-09-15 20:24:04 UTC (rev 1471)
@@ -31,15 +31,15 @@
   #define BASEGAME			"foobar"
   #define CLIENT_WINDOW_TITLE     	"changeme"
   #define CLIENT_WINDOW_MIN_TITLE 	"changeme2"
+  #define GAMENAME_FOR_MASTER		"iofoo3"	// must NOT contain whitespaces
 #else
   #define PRODUCT_NAME			"ioq3"
   #define BASEGAME			"baseq3"
   #define CLIENT_WINDOW_TITLE     	"ioquake3"
   #define CLIENT_WINDOW_MIN_TITLE 	"ioq3"
+  #define GAMENAME_FOR_MASTER		"Quake3Arena"
 #endif
 
-#define GAMENAME BASEGAME
-
 #ifdef _MSC_VER
   #define PRODUCT_VERSION "1.35"
 #endif

Modified: trunk/code/server/sv_main.c
===================================================================
--- trunk/code/server/sv_main.c	2008-09-05 23:38:35 UTC (rev 1470)
+++ trunk/code/server/sv_main.c	2008-09-15 20:24:04 UTC (rev 1471)
@@ -413,7 +413,7 @@
 		va("%i", sv_maxclients->integer - sv_privateClients->integer ) );
 	Info_SetValueForKey( infostring, "gametype", va("%i", sv_gametype->integer ) );
 	Info_SetValueForKey( infostring, "pure", va("%i", sv_pure->integer ) );
-	Info_SetValueForKey( infostring, "gamename", GAMENAME );
+	Info_SetValueForKey( infostring, "gamename", GAMENAME_FOR_MASTER );
 
 #ifdef USE_VOIP
 	if (sv_voip->integer) {