Disabled getting motd from update server in standalone build.

This commit is contained in:
Zack Middleton 2011-08-22 20:30:45 +00:00
parent 1469df546e
commit abe85940ae
2 changed files with 10 additions and 0 deletions

View file

@ -55,7 +55,9 @@ cvar_t *cl_nodelta;
cvar_t *cl_debugMove; cvar_t *cl_debugMove;
cvar_t *cl_noprint; cvar_t *cl_noprint;
#ifdef UPDATE_SERVER_NAME
cvar_t *cl_motd; cvar_t *cl_motd;
#endif
cvar_t *rcon_client_password; cvar_t *rcon_client_password;
cvar_t *rconAddress; cvar_t *rconAddress;
@ -1522,6 +1524,7 @@ CL_RequestMotd
=================== ===================
*/ */
void CL_RequestMotd( void ) { void CL_RequestMotd( void ) {
#ifdef UPDATE_SERVER_NAME
char info[MAX_INFO_STRING]; char info[MAX_INFO_STRING];
if ( !cl_motd->integer ) { if ( !cl_motd->integer ) {
@ -1547,6 +1550,7 @@ void CL_RequestMotd( void ) {
Info_SetValueForKey( info, "version", com_version->string ); Info_SetValueForKey( info, "version", com_version->string );
NET_OutOfBandPrint( NS_CLIENT, cls.updateServer, "getmotd \"%s\"\n", info ); NET_OutOfBandPrint( NS_CLIENT, cls.updateServer, "getmotd \"%s\"\n", info );
#endif
} }
/* /*
@ -2408,6 +2412,7 @@ CL_MotdPacket
=================== ===================
*/ */
void CL_MotdPacket( netadr_t from ) { void CL_MotdPacket( netadr_t from ) {
#ifdef UPDATE_SERVER_NAME
char *challenge; char *challenge;
char *info; char *info;
@ -2428,6 +2433,7 @@ void CL_MotdPacket( netadr_t from ) {
Q_strncpyz( cls.updateInfoString, info, sizeof( cls.updateInfoString ) ); Q_strncpyz( cls.updateInfoString, info, sizeof( cls.updateInfoString ) );
Cvar_Set( "cl_motdString", challenge ); Cvar_Set( "cl_motdString", challenge );
#endif
} }
/* /*
@ -3439,7 +3445,9 @@ void CL_Init( void ) {
// register our variables // register our variables
// //
cl_noprint = Cvar_Get( "cl_noprint", "0", 0 ); cl_noprint = Cvar_Get( "cl_noprint", "0", 0 );
#ifdef UPDATE_SERVER_NAME
cl_motd = Cvar_Get ("cl_motd", "1", 0); cl_motd = Cvar_Get ("cl_motd", "1", 0);
#endif
cl_timeout = Cvar_Get ("cl_timeout", "200", 0); cl_timeout = Cvar_Get ("cl_timeout", "200", 0);

View file

@ -260,7 +260,9 @@ PROTOCOL
// NOTE: that stuff only works with two digits protocols // NOTE: that stuff only works with two digits protocols
extern int demo_protocols[]; extern int demo_protocols[];
#if !defined UPDATE_SERVER_NAME && !defined STANDALONE
#define UPDATE_SERVER_NAME "update.quake3arena.com" #define UPDATE_SERVER_NAME "update.quake3arena.com"
#endif
// override on command line, config files etc. // override on command line, config files etc.
#ifndef MASTER_SERVER_NAME #ifndef MASTER_SERVER_NAME
#define MASTER_SERVER_NAME "master.quake3arena.com" #define MASTER_SERVER_NAME "master.quake3arena.com"