From 7aed4d18f2d6ee7f4e6ce12b55e1e17338f0123c Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:25:10 +0000 Subject: [PATCH] Rename NETWORK_LAN_BROADCAST_MSG to kNetworkLanBroadcastMsg --- src/openrct2/network/NetworkServerAdvertiser.cpp | 2 +- src/openrct2/network/ServerList.cpp | 2 +- src/openrct2/network/network.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 1ec59ff199..fed1d405f5 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -119,7 +119,7 @@ private: { std::string sender = endpoint->GetHostname(); LOG_VERBOSE("Received %zu bytes from %s on LAN broadcast port", recievedBytes, sender.c_str()); - if (String::Equals(buffer, NETWORK_LAN_BROADCAST_MSG)) + if (String::Equals(buffer, kNetworkLanBroadcastMsg)) { auto body = GetBroadcastJson(); auto bodyDump = body.dump(); diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index 0ab21ea663..8b7c2b79c5 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -270,7 +270,7 @@ std::future> ServerList::FetchLocalServerListAsync( constexpr auto RECV_DELAY_MS = 10; constexpr auto RECV_WAIT_MS = 2000; - std::string_view msg = NETWORK_LAN_BROADCAST_MSG; + std::string_view msg = kNetworkLanBroadcastMsg; auto udpSocket = CreateUdpSocket(); LOG_VERBOSE("Broadcasting %zu bytes to the LAN (%s)", msg.size(), broadcastAddress.c_str()); diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 9016ce78cf..320b7b32e3 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -11,7 +11,7 @@ constexpr uint16_t kNetworkDefaultPort = 11753; constexpr uint16_t kNetworkLanBroadcastPort = 11754; -#define NETWORK_LAN_BROADCAST_MSG "openrct2.server.query" +constexpr const char* kNetworkLanBroadcastMsg = "openrct2.server.query"; #define MAX_SERVER_DESCRIPTION_LENGTH 256 #include "../Game.h"