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

Change type of Filtered from int to bool

Browse source
This commit is contained in:
Robert Müller 2022-12-05 22:30:09 +01:00
parent 1051a935a0
commit cbf08b0025
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,33 +267,33 @@ void CServerBrowser::Filter()
// filter the servers
for(int i = 0; i < m_NumServers; i++)
{
int Filtered = 0;
bool Filtered = false;
if(g_Config.m_BrFilterEmpty && m_ppServerlist[i]->m_Info.m_NumFilteredPlayers == 0)
Filtered = 1;
Filtered = true;
else if(g_Config.m_BrFilterFull && Players(m_ppServerlist[i]->m_Info) == Max(m_ppServerlist[i]->m_Info))
Filtered = 1;
Filtered = true;
else if(g_Config.m_BrFilterPw && m_ppServerlist[i]->m_Info.m_Flags & SERVER_FLAG_PASSWORD)
Filtered = 1;
Filtered = true;
else if(g_Config.m_BrFilterServerAddress[0] && !str_find_nocase(m_ppServerlist[i]->m_Info.m_aAddress, g_Config.m_BrFilterServerAddress))
Filtered = 1;
Filtered = true;
else if(g_Config.m_BrFilterGametypeStrict && g_Config.m_BrFilterGametype[0] && str_comp_nocase(m_ppServerlist[i]->m_Info.m_aGameType, g_Config.m_BrFilterGametype))
Filtered = 1;
Filtered = true;
else if(!g_Config.m_BrFilterGametypeStrict && g_Config.m_BrFilterGametype[0] && !str_utf8_find_nocase(m_ppServerlist[i]->m_Info.m_aGameType, g_Config.m_BrFilterGametype))
Filtered = 1;
Filtered = true;
else if(g_Config.m_BrFilterUnfinishedMap && m_ppServerlist[i]->m_Info.m_HasRank == 1)
Filtered = 1;
Filtered = true;
else
{
if(g_Config.m_BrFilterCountry)
{
Filtered = 1;
Filtered = true;
// match against player country
for(int p = 0; p < minimum(m_ppServerlist[i]->m_Info.m_NumClients, (int)MAX_CLIENTS); p++)
{
if(m_ppServerlist[i]->m_Info.m_aClients[p].m_Country == g_Config.m_BrFilterCountryIndex)
{
Filtered = 0;
Filtered = false;
break;
}
}
@ -342,7 +342,7 @@ void CServerBrowser::Filter()
}
if(!MatchFound)
Filtered = 1;
Filtered = true;
}
if(!Filtered && g_Config.m_BrExcludeString[0] != '\0')
@ -359,28 +359,28 @@ void CServerBrowser::Filter()
// match against server name
if(str_utf8_find_nocase(m_ppServerlist[i]->m_Info.m_aName, aExcludeStr))
{
Filtered = 1;
Filtered = true;
break;
}
// match against map
if(str_utf8_find_nocase(m_ppServerlist[i]->m_Info.m_aMap, aExcludeStr))
{
Filtered = 1;
Filtered = true;
break;
}
// match against gametype
if(str_utf8_find_nocase(m_ppServerlist[i]->m_Info.m_aGameType, aExcludeStr))
{
Filtered = 1;
Filtered = true;
break;
}
}
}
}
if(Filtered == 0)
if(!Filtered)
{
// check for friend
m_ppServerlist[i]->m_Info.m_FriendState = IFriends::FRIEND_NO;