Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ServerList] Implement better sorting

Browse Source
This commit is contained in:
momo5502 2017-06-05 16:12:15 +02:00
parent 6846efb4e8
commit edaa0fe033
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Components/Modules/Friends.cpp
View File

@ -13,12 +13,9 @@ namespace Components
void Friends::SortIndividualList(std::vector<Friends::Friend>* list) void Friends::SortIndividualList(std::vector<Friends::Friend>* list)
{ {
qsort(list->data(), list->size(), sizeof(Friends::Friend), [](const void* first, const void* second) std::sort(list->begin(), list->end(), [](Friends::Friend const& friend1, Friends::Friend const& friend2)
{ {
const Friends::Friend* friend1 = static_cast<const Friends::Friend*>(first); return friend1.cleanName.compare(friend2.cleanName) <= 0;
const Friends::Friend* friend2 = static_cast<const Friends::Friend*>(second);
return friend1->cleanName.compare(friend2->cleanName);
}); });
} }

15
src/Components/Modules/ServerList.cpp
View File

@ -553,11 +553,12 @@ namespace Components
void ServerList::SortList() void ServerList::SortList()
{ {
qsort(ServerList::VisibleList.data(), ServerList::VisibleList.size(), sizeof(int), [] (const void* first, const void* second) // Only sort when the serverlist is open
{ Game::menuDef_t* menu = Game::Menus_FindByName(Game::uiContext, "pc_join_unranked");
const unsigned int server1 = *static_cast<const unsigned int*>(first); if(!menu || !Game::Menu_IsVisible(Game::uiContext, menu)) return;
const unsigned int server2 = *static_cast<const unsigned int*>(second);
std::sort(ServerList::VisibleList.begin(), ServerList::VisibleList.end(), [] (unsigned int const &server1, unsigned int const &server2)
{
ServerInfo* info1 = nullptr; ServerInfo* info1 = nullptr;
ServerInfo* info2 = nullptr; ServerInfo* info2 = nullptr;
@ -573,18 +574,18 @@ namespace Components
// Numerical comparisons // Numerical comparisons
if (ServerList::SortKey == ServerList::Column::Ping) if (ServerList::SortKey == ServerList::Column::Ping)
{ {
return ((info1->ping - info2->ping) * (ServerList::SortAsc ? 1 : -1)); return ((info1->ping < info2->ping) ^ !ServerList::SortAsc);
} }
else if (ServerList::SortKey == ServerList::Column::Players) else if (ServerList::SortKey == ServerList::Column::Players)
{ {
return ((info1->clients - info2->clients) * (ServerList::SortAsc ? 1 : -1)); return ((info1->clients < info2->clients) ^ !ServerList::SortAsc);
} }
std::string text1 = Colors::Strip(ServerList::GetServerInfoText(info1, ServerList::SortKey)); std::string text1 = Colors::Strip(ServerList::GetServerInfoText(info1, ServerList::SortKey));
std::string text2 = Colors::Strip(ServerList::GetServerInfoText(info2, ServerList::SortKey)); std::string text2 = Colors::Strip(ServerList::GetServerInfoText(info2, ServerList::SortKey));
// ASCII-based comparison // ASCII-based comparison
return (text1.compare(text2) * (ServerList::SortAsc ? 1 : -1)); return ((text1.compare(text2) <= 0) ^ !ServerList::SortAsc);
}); });
} }