From 4abe8caab83065f4d1645cca3f206961040291e3 Mon Sep 17 00:00:00 2001 From: trml Date: Mon, 24 Aug 2020 23:23:37 +0200 Subject: [PATCH 1/2] Sort servers by a combination of players and ping as default --- src/engine/client/serverbrowser.cpp | 31 +++++++++++++++----- src/engine/client/serverbrowser.h | 1 + src/engine/shared/config_variables.h | 2 +- src/game/client/components/menus.cpp | 4 ++- src/game/client/components/menus_browser.cpp | 15 ++++++++-- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp index 1bc41849b..a44045459 100644 --- a/src/engine/client/serverbrowser.cpp +++ b/src/engine/client/serverbrowser.cpp @@ -155,6 +155,19 @@ bool CServerBrowser::SortCompareNumClients(int Index1, int Index2) const return a->m_Info.m_NumClients < b->m_Info.m_NumClients; } +bool CServerBrowser::SortCompareNumPlayersAndPing(int Index1, int Index2) const +{ + CServerEntry *a = m_ppServerlist[Index1]; + CServerEntry *b = m_ppServerlist[Index2]; + + if(a->m_Info.m_NumFilteredPlayers == b->m_Info.m_NumFilteredPlayers) + return a->m_Info.m_Latency > b->m_Info.m_Latency; + if(a->m_Info.m_NumFilteredPlayers == 0 || b->m_Info.m_NumFilteredPlayers == 0) + return a->m_Info.m_NumFilteredPlayers == 0; + else + return a->m_Info.m_NumFilteredPlayers - (a->m_Info.m_Latency/100)*MAX_CLIENTS < b->m_Info.m_NumFilteredPlayers - (b->m_Info.m_Latency/100)*MAX_CLIENTS; +} + void CServerBrowser::Filter() { int i = 0, p = 0; @@ -322,13 +335,13 @@ int CServerBrowser::SortHash() const i |= g_Config.m_BrFilterFriends<<7; i |= g_Config.m_BrFilterPw<<8; i |= g_Config.m_BrSortOrder<<9; - i |= g_Config.m_BrFilterCompatversion<<10; - i |= g_Config.m_BrFilterPure<<11; - i |= g_Config.m_BrFilterPureMap<<12; - i |= g_Config.m_BrFilterGametypeStrict<<13; - i |= g_Config.m_BrFilterUnfinishedMap<<14; - i |= g_Config.m_BrFilterCountry<<15; - i |= g_Config.m_BrFilterConnectingPlayers<<16; + 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; return i; } @@ -364,7 +377,9 @@ void CServerBrowser::Sort() Filter(); // sort - if(g_Config.m_BrSort == IServerBrowser::SORT_NAME) + if(g_Config.m_BrSortOrder == 2 && (g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS ||g_Config.m_BrSort == IServerBrowser::SORT_PING)) + std::stable_sort(m_pSortedServerlist, m_pSortedServerlist+m_NumSortedServers, SortWrap(this, &CServerBrowser::SortCompareNumPlayersAndPing)); + else if(g_Config.m_BrSort == IServerBrowser::SORT_NAME) std::stable_sort(m_pSortedServerlist, m_pSortedServerlist+m_NumSortedServers, SortWrap(this, &CServerBrowser::SortCompareName)); else if(g_Config.m_BrSort == IServerBrowser::SORT_PING) std::stable_sort(m_pSortedServerlist, m_pSortedServerlist+m_NumSortedServers, SortWrap(this, &CServerBrowser::SortComparePing)); diff --git a/src/engine/client/serverbrowser.h b/src/engine/client/serverbrowser.h index 282d20208..3947f3920 100644 --- a/src/engine/client/serverbrowser.h +++ b/src/engine/client/serverbrowser.h @@ -182,6 +182,7 @@ private: bool SortCompareGametype(int Index1, int Index2) const; bool SortCompareNumPlayers(int Index1, int Index2) const; bool SortCompareNumClients(int Index1, int Index2) const; + bool SortCompareNumPlayersAndPing(int Index1, int Index2) const; // void Filter(); diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index b0e6324b9..4150efa00 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -62,7 +62,7 @@ MACRO_CONFIG_STR(BrFilterExcludeCountriesKoG, br_filter_exclude_countries_kog, 1 MACRO_CONFIG_STR(BrFilterExcludeTypesKoG, br_filter_exclude_types_kog, 128, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Filter out kog servers by type (mod)") MACRO_CONFIG_INT(BrSort, br_sort, 4, 0, 256, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Sorting column in server browser") -MACRO_CONFIG_INT(BrSortOrder, br_sort_order, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Sorting order in server browser") +MACRO_CONFIG_INT(BrSortOrder, br_sort_order, 2, 0, 2, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Sorting order in server browser") MACRO_CONFIG_INT(BrMaxRequests, br_max_requests, 25, 0, 1000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Number of requests to use when refreshing server browser") MACRO_CONFIG_INT(BrDemoSort, br_demo_sort, 0, 0, 3, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Sorting column in demo browser") diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index b7acf1c57..96fbcc939 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -174,7 +174,9 @@ int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, co int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect) { - if(Checked) + if(Checked == 2) + RenderTools()->DrawUIRect(pRect, ColorRGBA(1,0.98f,0.5f,0.55f), CUI::CORNER_T, 5.0f); + else if(Checked) RenderTools()->DrawUIRect(pRect, ColorRGBA(1,1,1,0.5f), CUI::CORNER_T, 5.0f); CUIRect t; pRect->VSplitLeft(5.0f, 0, &t); diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 833b4ba9c..d6ad22aba 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -109,15 +109,26 @@ void CMenus::RenderServerbrowserServerList(CUIRect View) s_aCols[i].m_Rect = Headers; } + const bool PlayersOrPing = (g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS || g_Config.m_BrSort == IServerBrowser::SORT_PING); + // do headers for(int i = 0; i < NumCols; i++) { - if(DoButton_GridHeader(s_aCols[i].m_Caption, s_aCols[i].m_Caption, g_Config.m_BrSort == s_aCols[i].m_Sort, &s_aCols[i].m_Rect)) + int Checked = g_Config.m_BrSort == s_aCols[i].m_Sort; + if(PlayersOrPing && g_Config.m_BrSortOrder == 2 && (s_aCols[i].m_Sort == IServerBrowser::SORT_NUMPLAYERS || s_aCols[i].m_Sort == IServerBrowser::SORT_PING)) + Checked = 2; + + if(DoButton_GridHeader(s_aCols[i].m_Caption, s_aCols[i].m_Caption, Checked, &s_aCols[i].m_Rect)) { if(s_aCols[i].m_Sort != -1) { if(g_Config.m_BrSort == s_aCols[i].m_Sort) - g_Config.m_BrSortOrder ^= 1; + { + if(PlayersOrPing) + g_Config.m_BrSortOrder = (g_Config.m_BrSortOrder+1)%3; + else + g_Config.m_BrSortOrder = (g_Config.m_BrSortOrder+1)%2; + } else g_Config.m_BrSortOrder = 0; g_Config.m_BrSort = s_aCols[i].m_Sort; From d5c030065aa58dce4358e994d605f1d69ff45b66 Mon Sep 17 00:00:00 2001 From: trml Date: Tue, 25 Aug 2020 02:26:36 +0200 Subject: [PATCH 2/2] Sort players by descending order first --- src/engine/client/serverbrowser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp index a44045459..876799d42 100644 --- a/src/engine/client/serverbrowser.cpp +++ b/src/engine/client/serverbrowser.cpp @@ -145,14 +145,14 @@ bool CServerBrowser::SortCompareNumPlayers(int Index1, int Index2) const { CServerEntry *a = m_ppServerlist[Index1]; CServerEntry *b = m_ppServerlist[Index2]; - return a->m_Info.m_NumFilteredPlayers < b->m_Info.m_NumFilteredPlayers; + return a->m_Info.m_NumFilteredPlayers > b->m_Info.m_NumFilteredPlayers; } bool CServerBrowser::SortCompareNumClients(int Index1, int Index2) const { CServerEntry *a = m_ppServerlist[Index1]; CServerEntry *b = m_ppServerlist[Index2]; - return a->m_Info.m_NumClients < b->m_Info.m_NumClients; + return a->m_Info.m_NumClients > b->m_Info.m_NumClients; } bool CServerBrowser::SortCompareNumPlayersAndPing(int Index1, int Index2) const