edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load serverbrowser more fairly

Browse source 
One from each country and so on instead of doing one country fully first
before moving to the next. This makes loading servers like Japan and AUS
much faster since they're at the back of the list. This also reduces the
peak number of packets sent to each IP at once.
This commit is contained in:
def 2020-08-30 12:24:13 +02:00
parent 92616f1a55
commit 44b1014f41
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/engine/client/serverbrowser.cpp
View file

@ -705,16 +705,26 @@ void CServerBrowser::Refresh(int Type)
CountryFilterClean(NETWORK_DDNET);
TypeFilterClean(NETWORK_DDNET);
int MaxServers = 0;
for(int i = 0; i < m_aNetworks[NETWORK_DDNET].m_NumCountries; i++)
{
CNetworkCountry *pCntr = &m_aNetworks[NETWORK_DDNET].m_aCountries[i];
MaxServers = maximum(MaxServers, pCntr->m_NumServers);
}
// check for filter
if(DDNetFiltered(g_Config.m_BrFilterExcludeCountries, pCntr->m_aName))
continue;
for(int g = 0; g < pCntr->m_NumServers; g++)
for(int g = 0; g < MaxServers; g++)
{
for(int i = 0; i < m_aNetworks[NETWORK_DDNET].m_NumCountries; i++)
{
CNetworkCountry *pCntr = &m_aNetworks[NETWORK_DDNET].m_aCountries[i];
// check for filter
if(DDNetFiltered(g_Config.m_BrFilterExcludeCountries, pCntr->m_aName))
continue;
if(g >= pCntr->m_NumServers)
continue;
if(!DDNetFiltered(g_Config.m_BrFilterExcludeTypes, pCntr->m_aTypes[g]))
Set(pCntr->m_aServers[g], IServerBrowser::SET_DDNET_ADD, -1, 0);
}
@ -726,16 +736,26 @@ void CServerBrowser::Refresh(int Type)
CountryFilterClean(NETWORK_KOG);
TypeFilterClean(NETWORK_KOG);
int MaxServers = 0;
for(int i = 0; i < m_aNetworks[NETWORK_KOG].m_NumCountries; i++)
{
CNetworkCountry *pCntr = &m_aNetworks[NETWORK_KOG].m_aCountries[i];
MaxServers = maximum(MaxServers, pCntr->m_NumServers);
}
// check for filter
if(DDNetFiltered(g_Config.m_BrFilterExcludeCountriesKoG, pCntr->m_aName))
continue;
for(int g = 0; g < pCntr->m_NumServers; g++)
for(int g = 0; g < MaxServers; g++)
{
for(int i = 0; i < m_aNetworks[NETWORK_KOG].m_NumCountries; i++)
{
CNetworkCountry *pCntr = &m_aNetworks[NETWORK_KOG].m_aCountries[i];
// check for filter
if(DDNetFiltered(g_Config.m_BrFilterExcludeCountriesKoG, pCntr->m_aName))
continue;
if(g >= pCntr->m_NumServers)
continue;
if(!DDNetFiltered(g_Config.m_BrFilterExcludeTypesKoG, pCntr->m_aTypes[g]))
Set(pCntr->m_aServers[g], IServerBrowser::SET_KOG_ADD, -1, 0);
}