From cca461effeeb6d00f5994f9daa4ed32bb1fe21d1 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 2 Jan 2024 11:59:16 -0800 Subject: [PATCH] Platform/Menu: Migration of Server_IsLan() into the master-server related code --- src/menu-fn/m_internetgames.qc | 3 +-- src/menu-fn/m_langames.qc | 3 ++- src/platform/master.qc | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/menu-fn/m_internetgames.qc b/src/menu-fn/m_internetgames.qc index 868e5cb3..1f388cb8 100644 --- a/src/menu-fn/m_internetgames.qc +++ b/src/menu-fn/m_internetgames.qc @@ -165,8 +165,7 @@ inet_refreshframe(void) address = gethostcachestring(srv_fldAdress, i); - /* skip LAN */ - if (!address || Server_IsLan(address)) { + if (!address) { continue; } diff --git a/src/menu-fn/m_langames.qc b/src/menu-fn/m_langames.qc index e63bcbdf..15d48090 100644 --- a/src/menu-fn/m_langames.qc +++ b/src/menu-fn/m_langames.qc @@ -62,7 +62,8 @@ lan_refreshframe(void) string ping; address = gethostcachestring(srv_fldAdress, i); - if (!address || !Server_IsLan(address)) { + + if (!address) { continue; } diff --git a/src/platform/master.qc b/src/platform/master.qc index f780c498..4d2468a3 100644 --- a/src/platform/master.qc +++ b/src/platform/master.qc @@ -14,6 +14,18 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +static bool +Server_IsLan(string address) +{ + tokenizebyseparator(address, "."); + + if (argv(0) == "192" && argv(1) == "168") { + return (1); + } else { + return (0); + } +} + string Master_Resolve(void) {