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

Don't sort on entry adding

Browse source
This commit is contained in:
Jupeyy 2020-12-22 11:13:51 +01:00
parent f190e529b6
commit fb74bcbb55
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,8 @@ CServerBrowser::CServerBrowser()
m_RequestNumber = 0;
m_pDDNetInfo = 0;
m_SortOnNextUpdate = false;
}
CServerBrowser::~CServerBrowser()
@ -369,10 +371,6 @@ void CServerBrowser::Sort()
else if(g_Config.m_BrSort == IServerBrowser::SORT_GAMETYPE)
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, SortWrap(this, &CServerBrowser::SortCompareGametype));
// set indexes
for(i = 0; i < m_NumSortedServers; i++)
m_ppServerlist[m_pSortedServerlist[i]]->m_Info.m_SortedIndex = i;
str_copy(m_aFilterGametypeString, g_Config.m_BrFilterGametype, sizeof(m_aFilterGametypeString));
str_copy(m_aFilterString, g_Config.m_BrFilterString, sizeof(m_aFilterString));
m_Sorthash = SortHash();
@ -621,7 +619,7 @@ void CServerBrowser::Set(const NETADDR &Addr, int Type, int Token, const CServer
RemoveRequest(pEntry);
}
Sort();
m_SortOnNextUpdate = true;
}
void CServerBrowser::Refresh(int Type)
@ -981,8 +979,11 @@ void CServerBrowser::Update(bool ForceResort)
}
// check if we need to resort
if(m_Sorthash != SortHash() || ForceResort)
if(m_Sorthash != SortHash() || ForceResort || m_SortOnNextUpdate)
{
Sort();
m_SortOnNextUpdate = false;
}
}
bool CServerBrowser::IsFavorite(const NETADDR &Addr) const

2
src/engine/client/serverbrowser.h
View file

@ -178,6 +178,8 @@ private:
int m_RequestNumber;
unsigned char m_aTokenSeed[16];
bool m_SortOnNextUpdate;
int GenerateToken(const NETADDR &Addr) const;
static int GetBasicToken(int Token);
static int GetExtraToken(int Token);

1
src/engine/serverbrowser.h
View file

@ -32,7 +32,6 @@ public:
int m_FriendState;
};
int m_SortedIndex;
int m_ServerIndex;
int m_Type;