mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity

Improve status messages and prevent duplicates

Browse Source
This commit is contained in:
Ted John
2019-05-05 15:48:35 +00:00
parent 04c04d197e
commit 51117432f0
3 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2/network/ServerList.cpp
View File

@@ -42,7 +42,7 @@ int32_t ServerListEntry::CompareTo(const ServerListEntry& other) const
// Order by local
if (a.local != b.local)
{
return a.local ? 1 : -1;
return a.local ? -1 : 1;
}
// Then by version
@@ -50,13 +50,19 @@ int32_t ServerListEntry::CompareTo(const ServerListEntry& other) const
bool serverBCompatible = b.version == network_get_version();
if (serverACompatible != serverBCompatible)
{
return serverACompatible ? 1 : -1;
return serverACompatible ? -1 : 1;
}
// Then by password protection
if (a.requiresPassword != b.requiresPassword)
{
return a.requiresPassword ? -1 : 1;
return a.requiresPassword ? 1 : -1;
}
// Then by number of players
if (a.players != b.players)
{
return a.players > b.players ? -1 : 1;
}
// Then by name
@@ -102,8 +108,19 @@ std::optional<ServerListEntry> ServerListEntry::FromJson(const json_t* server)
void ServerList::Sort()
{
_serverEntries.erase(
std::unique(
_serverEntries.begin(), _serverEntries.end(),
[](const ServerListEntry& a, const ServerListEntry& b) {
if (a.favourite == b.favourite)
{
return String::Equals(a.address, b.address, true);
}
return false;
}),
_serverEntries.end());
std::sort(_serverEntries.begin(), _serverEntries.end(), [](const ServerListEntry& a, const ServerListEntry& b) {
return a.CompareTo(b) > 0;
return a.CompareTo(b) < 0;
});
}
@@ -129,6 +146,11 @@ void ServerList::AddRange(const std::vector<ServerListEntry>& entries)
Sort();
}
void ServerList::Clear()
{
_serverEntries.clear();
}
std::vector<ServerListEntry> ServerList::ReadFavourites()
{
log_verbose("server_list_read(...)");