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

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-01-24 13:09:20 -0500 (Mon, 24 Jan 2011)
New Revision: 1815

Modified:
   trunk/code/qcommon/q_shared.h
   trunk/code/server/sv_main.c
Log:
Make this change so standalone developers will know to change the HEARTBEAT game string for their versions, too.


Modified: trunk/code/qcommon/q_shared.h
===================================================================
--- trunk/code/qcommon/q_shared.h	2011-01-24 18:04:20 UTC (rev 1814)
+++ trunk/code/qcommon/q_shared.h	2011-01-24 18:09:20 UTC (rev 1815)
@@ -31,13 +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
+  #define GAMENAME_FOR_MASTER		"iofoo3"		// must NOT contain whitespaces
+  #define HEARTBEAT_FOR_MASTER		GAMENAME_FOR_MASTER
 #else
   #define PRODUCT_NAME			"ioq3"
   #define BASEGAME			"baseq3"
   #define CLIENT_WINDOW_TITLE     	"ioquake3"
   #define CLIENT_WINDOW_MIN_TITLE 	"ioq3"
   #define GAMENAME_FOR_MASTER		"Quake3Arena"
+  #define HEARTBEAT_FOR_MASTER		"QuakeArena-1"
 #endif
 
 #ifdef _MSC_VER

Modified: trunk/code/server/sv_main.c
===================================================================
--- trunk/code/server/sv_main.c	2011-01-24 18:04:20 UTC (rev 1814)
+++ trunk/code/server/sv_main.c	2011-01-24 18:09:20 UTC (rev 1815)
@@ -232,7 +232,6 @@
 ================
 */
 #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;
@@ -316,9 +315,9 @@
 		// ever incompatably changes
 
 		if(adr[i][0].type != NA_BAD)
-			NET_OutOfBandPrint( NS_SERVER, adr[i][0], "heartbeat %s\n", HEARTBEAT_GAME );
+			NET_OutOfBandPrint( NS_SERVER, adr[i][0], "heartbeat %s\n", HEARTBEAT_FOR_MASTER );
 		if(adr[i][1].type != NA_BAD)
-			NET_OutOfBandPrint( NS_SERVER, adr[i][1], "heartbeat %s\n", HEARTBEAT_GAME );
+			NET_OutOfBandPrint( NS_SERVER, adr[i][1], "heartbeat %s\n", HEARTBEAT_FOR_MASTER );
 	}
 }