From 8243a77c0eeaf8294a8cb35b7cc0c2ba6f233170 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Mon, 24 Jan 2011 01:24:07 +0000 Subject: [PATCH] Revert changes because dpmaster doesn't work that way. --- code/qcommon/q_shared.h | 2 +- code/server/sv_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 3469ea5e..4374ced8 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #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 diff --git a/code/server/sv_main.c b/code/server/sv_main.c index b68dd6b2..67d7d515 100644 --- a/code/server/sv_main.c +++ b/code/server/sv_main.c @@ -232,6 +232,7 @@ but not on every player enter or exit. ================ */ #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 @@ void SV_MasterHeartbeat( void ) { // 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 ); } }