mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Remove Network function name prefixes given namespace qualifiers

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-31 16:02:43 +02:00
parent 58569d6d50
commit 5a4cc7d00d
73 changed files with 1060 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,8 @@ namespace OpenRCT2::Network
return a.Local ? -1 : 1;
}
bool serverACompatible = a.Version == NetworkGetVersion();
bool serverBCompatible = b.Version == NetworkGetVersion();
bool serverACompatible = a.Version == Network::GetVersion();
bool serverBCompatible = b.Version == Network::GetVersion();
if (serverACompatible != serverBCompatible)
{
return serverACompatible ? -1 : 1;
@@ -70,7 +70,7 @@ namespace OpenRCT2::Network
bool ServerListEntry::IsVersionValid() const noexcept
{
return Version.empty() || Version == NetworkGetVersion();
return Version.empty() || Version == Network::GetVersion();
}
std::optional<ServerListEntry> ServerListEntry::FromJson(json_t& server)
@@ -293,7 +293,7 @@ namespace OpenRCT2::Network
size_t recievedLen{};
std::unique_ptr<INetworkEndpoint> endpoint;
auto p = udpSocket->ReceiveData(buffer, sizeof(buffer) - 1, &recievedLen, &endpoint);
if (p == NetworkReadPacket::Success)
if (p == NetworkReadPacket::success)
{
auto sender = endpoint->GetHostname();
LOG_VERBOSE("Received %zu bytes back from %s", recievedLen, sender.c_str());