diff options
| author | Tim Angus <tim@ngus.net> | 2015-06-08 23:15:03 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2015-06-08 23:15:03 +0100 |
| commit | 6204532c35bab4977d3bd4d2bf7a9a3b90e9620e (patch) | |
| tree | d0cfa4aba0d0d53c3b99be8c090601f052ed6f78 /src/client | |
| parent | b8b66865c8ff4c756fe3544decb5504dbc2abdf7 (diff) | |
| parent | 9ff64e51801485a4153c665200842e40ba80ce3b (diff) | |
Merge pull request #12 from jkent/gpp
gpp compat changes
Diffstat (limited to 'src/client')
| -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++) { |