3 files changed, 7 insertions, 2 deletions
diff --git a/src/qcommon/common.c b/src/qcommon/common.c
index 3127dec1..5589b384 100644
--- a/src/qcommon/common.c
+++ b/src/qcommon/common.c
@@ -84,6 +84,7 @@ cvar_t	*com_maxfpsUnfocused;
 cvar_t	*com_minimized;
 cvar_t	*com_maxfpsMinimized;
 cvar_t	*com_abnormalExit;
+cvar_t	*com_gamename;
 cvar_t  *com_homepath;
 cvar_t	*com_busyWait;
 
@@ -2661,6 +2662,7 @@ void Com_Init( char *commandLine ) {
 	s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
 	com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
 	Cvar_Get ("protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_ROM);
+	com_gamename = Cvar_Get("com_gamename", GAMENAME_FOR_MASTER, CVAR_SERVERINFO | CVAR_INIT);
 
 	Sys_Init();
 
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 189d1751..51e3b220 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -38,12 +38,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_VERSION                 PRODUCT_NAME " " PRODUCT_VERSION
 
 #define GAMENAME_FOR_MASTER       "Tremulous"
-#define HEARTBEAT_FOR_MASTER      GAMENAME_FOR_MASTER
-#define FLATLINE_FOR_MASTER       GAMENAME_FOR_MASTER "dead"
 #define HOMEPATH_NAME_UNIX        ".tremulous"
 #define HOMEPATH_NAME_WIN         "Tremulous"
 #define HOMEPATH_NAME_MACOSX      HOMEPATH_NAME_WIN
 
+// Heartbeat for dpmaster protocol. You shouldn't change this unless you know what you're doing
+#define HEARTBEAT_FOR_MASTER      "DarkPlaces"
+
 #define MAX_TEAMNAME 32
 #define MAX_MASTER_SERVERS      5 // number of supported master servers
 
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index ead93b15..275fb4a5 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -846,6 +846,8 @@ extern	cvar_t	*sv_paused;
 extern	cvar_t	*cl_packetdelay;
 extern	cvar_t	*sv_packetdelay;
 
+extern	cvar_t	*com_gamename;
+
 // com_speeds times
 extern	int		time_game;
 extern	int		time_frontend;