diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-04-18 15:52:27 -0500 |
|---|---|---|
| committer | Jeff Kent <jeff@jkent.net> | 2015-06-08 17:01:01 -0500 |
| commit | 716b3ff876671b1711814cf99ae8e7264147c87a (patch) | |
| tree | 29edb378d00e108d272f5f8b0f3109b774cbfa27 | |
| parent | b2a8e63c896467f5edea2a49d8b536957845c9dd (diff) | |
change the serverlist-querying methods to be compatible with the current deployment of master servers
| -rw-r--r-- | src/client/cl_main.c | 22 | ||||
| -rw-r--r-- | src/qcommon/qcommon.h | 2 | ||||
| -rw-r--r-- | src/server/sv_init.c | 3 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 2 |
4 files changed, 6 insertions, 23 deletions
diff --git a/src/client/cl_main.c b/src/client/cl_main.c index 03bd542c..34eb95af 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -4168,25 +4168,9 @@ void CL_GlobalServers_f( void ) { cls.numglobalservers = -1; cls.pingUpdateSource = AS_GLOBAL; - // Use the extended query for IPv6 masters - if (to.type == NA_IP6 || to.type == NA_MULTICAST6) - { - int v4enabled = Cvar_VariableIntegerValue("net_enabled") & NET_ENABLEV4; - - if(v4enabled) - { - Com_sprintf(command, sizeof(command), "getserversExt %s %s", - com_gamename->string, Cmd_Argv(2)); - } - else - { - Com_sprintf(command, sizeof(command), "getserversExt %s %s ipv6", - com_gamename->string, Cmd_Argv(2)); - } - } - else - Com_sprintf(command, sizeof(command), "getservers %s %s", - com_gamename->string, Cmd_Argv(2)); + Com_sprintf(command, sizeof(command), "getserversExt %s %i%s", + com_gamename->string, PROTOCOL_VERSION, + (Cvar_VariableIntegerValue("net_enabled") & NET_ENABLEV4 ? "" : " ipv6")); for (i=3; i < count; i++) { diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 98d1f1ec..9dd6df43 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -256,7 +256,7 @@ extern int demo_protocols[]; #define MASTER_SERVER_NAME "master.tremulous.net" #endif -#define PORT_MASTER 30710 +#define PORT_MASTER 30700 #define PORT_SERVER 30720 #define NUM_SERVER_PORTS 4 // broadcast scan this many ports after // PORT_SERVER so a single machine can diff --git a/src/server/sv_init.c b/src/server/sv_init.c index 30fd3936..3fde62ef 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -665,8 +665,7 @@ void SV_Init (void) Cvar_Get ("sv_dlURL", "http://downloads.tremulous.net", CVAR_SERVERINFO | CVAR_ARCHIVE); sv_master[0] = Cvar_Get("sv_master1", MASTER_SERVER_NAME, 0); - sv_master[1] = Cvar_Get("sv_master2", "master.ioquake3.org", 0); - for(index = 2; index < MAX_MASTER_SERVERS; index++) + for(index = 1; index < MAX_MASTER_SERVERS; index++) sv_master[index] = Cvar_Get(va("sv_master%d", index + 1), "", CVAR_ARCHIVE); sv_reconnectlimit = Cvar_Get ("sv_reconnectlimit", "3", 0); diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 1e6ddad7..74a937a8 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -1120,7 +1120,7 @@ static void UI_StartServerRefresh( qboolean full ) { qboolean global = ui_netSource.integer == AS_GLOBAL; - trap_Cmd_ExecuteText( EXEC_APPEND, va( "globalservers %d full empty\n", + trap_Cmd_ExecuteText( EXEC_APPEND, va( "globalservers %d 70 full empty\n", global ? 0 : 1 ) ); } } |