mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 10:08:18 +00:00
Rename class SortWrap
to CSortWrap
This commit is contained in:
parent
518210dfe1
commit
c72861fb6d
|
@ -34,14 +34,14 @@
|
|||
|
||||
#include <game/client/components/menus.h> // PAGE_DDNET
|
||||
|
||||
class SortWrap
|
||||
class CSortWrap
|
||||
{
|
||||
typedef bool (CServerBrowser::*SortFunc)(int, int) const;
|
||||
SortFunc m_pfnSort;
|
||||
CServerBrowser *m_pThis;
|
||||
|
||||
public:
|
||||
SortWrap(CServerBrowser *pServer, SortFunc Func) :
|
||||
CSortWrap(CServerBrowser *pServer, SortFunc Func) :
|
||||
m_pfnSort(Func), m_pThis(pServer) {}
|
||||
bool operator()(int a, int b) { return (g_Config.m_BrSortOrder ? (m_pThis->*m_pfnSort)(b, a) : (m_pThis->*m_pfnSort)(a, b)); }
|
||||
};
|
||||
|
@ -439,17 +439,17 @@ void CServerBrowser::Sort()
|
|||
|
||||
// sort
|
||||
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));
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(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));
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(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));
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortComparePing));
|
||||
else if(g_Config.m_BrSort == IServerBrowser::SORT_MAP)
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, SortWrap(this, &CServerBrowser::SortCompareMap));
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareMap));
|
||||
else if(g_Config.m_BrSort == IServerBrowser::SORT_NUMPLAYERS)
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, SortWrap(this, &CServerBrowser::SortCompareNumPlayers));
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareNumPlayers));
|
||||
else if(g_Config.m_BrSort == IServerBrowser::SORT_GAMETYPE)
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, SortWrap(this, &CServerBrowser::SortCompareGametype));
|
||||
std::stable_sort(m_pSortedServerlist, m_pSortedServerlist + m_NumSortedServers, CSortWrap(this, &CServerBrowser::SortCompareGametype));
|
||||
|
||||
str_copy(m_aFilterGametypeString, g_Config.m_BrFilterGametype);
|
||||
str_copy(m_aFilterString, g_Config.m_BrFilterString);
|
||||
|
|
Loading…
Reference in a new issue