[quake3-commits] r1812 - in trunk/code: qcommon server

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-01-23 20:24:07 -0500 (Sun, 23 Jan 2011)
New Revision: 1812

Modified:
   trunk/code/qcommon/q_shared.h
   trunk/code/server/sv_main.c
Log:
Revert changes because dpmaster doesn't work that way.


Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2011-01-24 00:21:33 UTC (rev 1811)
+++ trunk/code/qcommon/q_shared.h	2011-01-24 01:24:07 UTC (rev 1812)
@@ -37,7 +37,7 @@
   #define BASEGAME			"baseq3"
   #define CLIENT_WINDOW_TITLE     	"ioquake3"
   #define CLIENT_WINDOW_MIN_TITLE 	"ioq3"
-  #define GAMENAME_FOR_MASTER		"QuakeArena-1"
+  #define GAMENAME_FOR_MASTER		"Quake3Arena"
 #endif
 
 #ifdef _MSC_VER

Modified: trunk/code/server/sv_main.c
===================================================================
--- trunk/code/server/sv_main.c	2011-01-24 00:21:33 UTC (rev 1811)
+++ trunk/code/server/sv_main.c	2011-01-24 01:24:07 UTC (rev 1812)
@@ -232,6 +232,7 @@
 ================
 */
 #define	HEARTBEAT_MSEC	300*1000
+#define	HEARTBEAT_GAME	"QuakeArena-1"
 void SV_MasterHeartbeat( void ) {
 	static netadr_t	adr[MAX_MASTER_SERVERS][2]; // [2] for v4 and v6 address for the same address string.
 	int			i;
@@ -315,9 +316,9 @@
 		// ever incompatably changes
 
 		if(adr[i][0].type != NA_BAD)
-			NET_OutOfBandPrint(NS_SERVER, adr[i][0], "heartbeat %s\n", GAMENAME_FOR_MASTER);
+			NET_OutOfBandPrint( NS_SERVER, adr[i][0], "heartbeat %s\n", HEARTBEAT_GAME );
 		if(adr[i][1].type != NA_BAD)
-			NET_OutOfBandPrint(NS_SERVER, adr[i][1], "heartbeat %s\n", GAMENAME_FOR_MASTER);
+			NET_OutOfBandPrint( NS_SERVER, adr[i][1], "heartbeat %s\n", HEARTBEAT_GAME );
 	}
 }