aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-09-15 20:24:04 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-09-15 20:24:04 +0000
commit134e4522a3a9eb3f3e2f8e3646eb3d3999d49694 (patch)
tree582e71ac4ea3094c6b7e2a9f15f79315bf6aaa01
parent375858a20dcd36f9e2187af181228a9493d9f6e7 (diff)
downloadioquake3-aero-134e4522a3a9eb3f3e2f8e3646eb3d3999d49694.tar.gz
ioquake3-aero-134e4522a3a9eb3f3e2f8e3646eb3d3999d49694.zip
* Supply specific identifier to the master server (Mathieu Olivier)
git-svn-id: svn://svn.icculus.org/quake3/trunk@1471 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/client/cl_main.c2
-rw-r--r--code/qcommon/q_shared.h4
-rw-r--r--code/server/sv_main.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 353d2b3..64c1cfb 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -3666,7 +3666,7 @@ void CL_GlobalServers_f( void ) {
// 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
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index a18ea29..41ff158 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -31,15 +31,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#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
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 4be0af4..5d53ec5 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -413,7 +413,7 @@ void SVC_Info( netadr_t from ) {
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) {