From f74cc43f4c2bb0438b3fad217353a0983cc6670a Mon Sep 17 00:00:00 2001 From: def Date: Sat, 26 Sep 2020 10:47:29 +0200 Subject: [PATCH 1/2] Remove pure server filters, add space for Countries/Types Not so relevant anymore --- src/engine/client/serverbrowser.cpp | 35 +++----------------- src/engine/shared/config_variables.h | 2 -- src/game/client/components/menus_browser.cpp | 12 +------ 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp index 4a82a60fe..65ce15693 100644 --- a/src/engine/client/serverbrowser.cpp +++ b/src/engine/client/serverbrowser.cpp @@ -193,31 +193,6 @@ void CServerBrowser::Filter() Filtered = 1; else if(g_Config.m_BrFilterPw && m_ppServerlist[i]->m_Info.m_Flags&SERVER_FLAG_PASSWORD) Filtered = 1; - else if(g_Config.m_BrFilterPure && - (str_comp(m_ppServerlist[i]->m_Info.m_aGameType, "DM") != 0 && - str_comp(m_ppServerlist[i]->m_Info.m_aGameType, "TDM") != 0 && - str_comp(m_ppServerlist[i]->m_Info.m_aGameType, "CTF") != 0)) - { - Filtered = 1; - } - else if(g_Config.m_BrFilterPureMap && - !(str_comp(m_ppServerlist[i]->m_Info.m_aMap, "dm1") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "dm2") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "dm6") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "dm7") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "dm8") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "dm9") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf1") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf2") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf3") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf4") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf5") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf6") == 0 || - str_comp(m_ppServerlist[i]->m_Info.m_aMap, "ctf7") == 0) - ) - { - Filtered = 1; - } else if(g_Config.m_BrFilterPing && g_Config.m_BrFilterPing < m_ppServerlist[i]->m_Info.m_Latency) Filtered = 1; else if(g_Config.m_BrFilterCompatversion && str_comp_num(m_ppServerlist[i]->m_Info.m_aVersion, m_aNetVersion, 3) != 0) @@ -336,12 +311,10 @@ int CServerBrowser::SortHash() const i |= g_Config.m_BrFilterPw<<8; i |= g_Config.m_BrSortOrder<<9; i |= g_Config.m_BrFilterCompatversion<<11; - i |= g_Config.m_BrFilterPure<<12; - i |= g_Config.m_BrFilterPureMap<<13; - i |= g_Config.m_BrFilterGametypeStrict<<14; - i |= g_Config.m_BrFilterUnfinishedMap<<15; - i |= g_Config.m_BrFilterCountry<<16; - i |= g_Config.m_BrFilterConnectingPlayers<<17; + i |= g_Config.m_BrFilterGametypeStrict<<12; + i |= g_Config.m_BrFilterUnfinishedMap<<13; + i |= g_Config.m_BrFilterCountry<<14; + i |= g_Config.m_BrFilterConnectingPlayers<<15; return i; } diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 6dd16f471..2eaede357 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -52,8 +52,6 @@ MACRO_CONFIG_STR(BrFilterGametype, br_filter_gametype, 128, "", CFGFLAG_SAVE | C MACRO_CONFIG_INT(BrFilterGametypeStrict, br_filter_gametype_strict, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Strict gametype filter") MACRO_CONFIG_INT(BrFilterConnectingPlayers, br_filter_connecting_players, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter connecting players") MACRO_CONFIG_STR(BrFilterServerAddress, br_filter_serveraddress, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "Server address to filter") -MACRO_CONFIG_INT(BrFilterPure, br_filter_pure, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out non-standard servers in browser") -MACRO_CONFIG_INT(BrFilterPureMap, br_filter_pure_map, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out non-standard maps in browser") MACRO_CONFIG_INT(BrFilterCompatversion, br_filter_compatversion, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Filter out non-compatible servers in browser") MACRO_CONFIG_INT(BrFilterUnfinishedMap, br_filter_unfinished_map, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Show only servers with unfinished maps") diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index ff8011fdf..70093209a 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -695,14 +695,6 @@ void CMenus::RenderServerbrowserFilters(CUIRect View) if(DoButton_CheckBox(&g_Config.m_BrFilterCompatversion, Localize("Compatible version"), g_Config.m_BrFilterCompatversion, &Button)) g_Config.m_BrFilterCompatversion ^= 1; - ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter); - if(DoButton_CheckBox(&g_Config.m_BrFilterPure, Localize("Standard gametype"), g_Config.m_BrFilterPure, &Button)) - g_Config.m_BrFilterPure ^= 1; - - ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter); - if(DoButton_CheckBox(&g_Config.m_BrFilterPureMap, Localize("Standard map"), g_Config.m_BrFilterPureMap, &Button)) - g_Config.m_BrFilterPureMap ^= 1; - ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter); if(DoButton_CheckBox(&g_Config.m_BrFilterGametypeStrict, Localize("Strict gametype filter"), g_Config.m_BrFilterGametypeStrict, &Button)) g_Config.m_BrFilterGametypeStrict ^= 1; @@ -806,7 +798,7 @@ void CMenus::RenderServerbrowserFilters(CUIRect View) // add more space ServerFilter.HSplitTop(5.0f, 0, &ServerFilter); ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter); - ServerFilter.HSplitTop(80.0f, &ServerFilter, 0); + ServerFilter.HSplitTop(140.0f, &ServerFilter, 0); RenderTools()->DrawUIRect(&ServerFilter, ms_ColorTabbarActive, CUI::CORNER_B, 10.0f); @@ -997,8 +989,6 @@ void CMenus::RenderServerbrowserFilters(CUIRect View) g_Config.m_BrFilterConnectingPlayers = 1; g_Config.m_BrFilterUnfinishedMap = 0; g_Config.m_BrFilterServerAddress[0] = 0; - g_Config.m_BrFilterPure = 0; - g_Config.m_BrFilterPureMap = 0; g_Config.m_BrFilterCompatversion = 0; g_Config.m_BrFilterExcludeCountries[0] = 0; g_Config.m_BrFilterExcludeTypes[0] = 0; From f8fc11b880a65b25cacc4baeb17bc4224227a86b Mon Sep 17 00:00:00 2001 From: def Date: Sat, 26 Sep 2020 21:33:36 +0200 Subject: [PATCH 2/2] clang-format --- src/engine/client/serverbrowser.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp index 65ce15693..7020c0370 100644 --- a/src/engine/client/serverbrowser.cpp +++ b/src/engine/client/serverbrowser.cpp @@ -303,18 +303,18 @@ void CServerBrowser::Filter() int CServerBrowser::SortHash() const { - int i = g_Config.m_BrSort&0xff; - i |= g_Config.m_BrFilterEmpty<<4; - i |= g_Config.m_BrFilterFull<<5; - i |= g_Config.m_BrFilterSpectators<<6; - i |= g_Config.m_BrFilterFriends<<7; - i |= g_Config.m_BrFilterPw<<8; - i |= g_Config.m_BrSortOrder<<9; - i |= g_Config.m_BrFilterCompatversion<<11; - i |= g_Config.m_BrFilterGametypeStrict<<12; - i |= g_Config.m_BrFilterUnfinishedMap<<13; - i |= g_Config.m_BrFilterCountry<<14; - i |= g_Config.m_BrFilterConnectingPlayers<<15; + int i = g_Config.m_BrSort & 0xff; + i |= g_Config.m_BrFilterEmpty << 4; + i |= g_Config.m_BrFilterFull << 5; + i |= g_Config.m_BrFilterSpectators << 6; + i |= g_Config.m_BrFilterFriends << 7; + i |= g_Config.m_BrFilterPw << 8; + i |= g_Config.m_BrSortOrder << 9; + i |= g_Config.m_BrFilterCompatversion << 11; + i |= g_Config.m_BrFilterGametypeStrict << 12; + i |= g_Config.m_BrFilterUnfinishedMap << 13; + i |= g_Config.m_BrFilterCountry << 14; + i |= g_Config.m_BrFilterConnectingPlayers << 15; return i; }