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

fixed asserts when sorting the server browser

Browse source
This commit is contained in:
oy 2012-07-29 12:09:31 +02:00
parent c808d48f20
commit c28a45796b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,8 @@ bool CServerBrowser::CServerFilter::SortComparePing(int Index1, int Index2) cons
{
CServerEntry *a = m_pServerBrowser->m_ppServerlist[Index1];
CServerEntry *b = m_pServerBrowser->m_ppServerlist[Index2];
return a->m_Info.m_Latency < b->m_Info.m_Latency || (a->m_Info.m_Latency == b->m_Info.m_Latency && (a->m_Info.m_Flags&FLAG_PURE));
return a->m_Info.m_Latency < b->m_Info.m_Latency ||
(a->m_Info.m_Latency == b->m_Info.m_Latency && (a->m_Info.m_Flags&FLAG_PURE) && !(b->m_Info.m_Flags&FLAG_PURE));
}
bool CServerBrowser::CServerFilter::SortCompareGametype(int Index1, int Index2) const
@ -164,14 +165,16 @@ bool CServerBrowser::CServerFilter::SortCompareNumPlayers(int Index1, int Index2
{
CServerEntry *a = m_pServerBrowser->m_ppServerlist[Index1];
CServerEntry *b = m_pServerBrowser->m_ppServerlist[Index2];
return a->m_Info.m_NumPlayers < b->m_Info.m_NumPlayers || (a->m_Info.m_NumPlayers == b->m_Info.m_NumPlayers && !(a->m_Info.m_Flags&FLAG_PURE));
return a->m_Info.m_NumPlayers < b->m_Info.m_NumPlayers ||
(a->m_Info.m_NumPlayers == b->m_Info.m_NumPlayers && !(a->m_Info.m_Flags&FLAG_PURE) && (b->m_Info.m_Flags&FLAG_PURE));
}
bool CServerBrowser::CServerFilter::SortCompareNumClients(int Index1, int Index2) const
{
CServerEntry *a = m_pServerBrowser->m_ppServerlist[Index1];
CServerEntry *b = m_pServerBrowser->m_ppServerlist[Index2];
return a->m_Info.m_NumClients < b->m_Info.m_NumClients || (a->m_Info.m_NumClients == b->m_Info.m_NumClients && !(a->m_Info.m_Flags&FLAG_PURE));
return a->m_Info.m_NumClients < b->m_Info.m_NumClients ||
(a->m_Info.m_NumClients == b->m_Info.m_NumClients && !(a->m_Info.m_Flags&FLAG_PURE) && (b->m_Info.m_Flags&FLAG_PURE));
}
void CServerBrowser::CServerFilter::Filter()