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 /src/client/cl_main.c | |
| parent | b2a8e63c896467f5edea2a49d8b536957845c9dd (diff) | |
change the serverlist-querying methods to be compatible with the current deployment of master servers
Diffstat (limited to 'src/client/cl_main.c')
| -rw-r--r-- | src/client/cl_main.c | 22 |
1 files changed, 3 insertions, 19 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++) { |