From 5ef115941d65c78e7f19dde437878a1d038a555b Mon Sep 17 00:00:00 2001
From: Harry-Hopkinson <harryjhopkinson@gmail.com>
Date: Fri, 26 Apr 2024 16:14:19 +0000
Subject: [PATCH] Rename NETWORK_DEFAULT_PORT to kNetworkDefaultPort

---
 src/openrct2-ui/windows/ServerList.cpp     | 2 +-
 src/openrct2/command_line/RootCommands.cpp | 2 +-
 src/openrct2/command_line/UriHandler.cpp   | 2 +-
 src/openrct2/config/Config.cpp             | 2 +-
 src/openrct2/network/network.h             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index 840fc3642a..850c68bc27 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -557,7 +557,7 @@ static Widget _serverListWidgets[] = {
 
     void JoinServer(std::string address)
     {
-        int32_t port = NETWORK_DEFAULT_PORT;
+        int32_t port = kNetworkDefaultPort;
         auto endBracketIndex = address.find(']');
         auto colonIndex = address.find_last_of(':');
         if (colonIndex != std::string::npos)
diff --git a/src/openrct2/command_line/RootCommands.cpp b/src/openrct2/command_line/RootCommands.cpp
index 8d51345738..9bf01e9b9e 100644
--- a/src/openrct2/command_line/RootCommands.cpp
+++ b/src/openrct2/command_line/RootCommands.cpp
@@ -40,7 +40,7 @@
 #ifndef DISABLE_NETWORK
 int32_t gNetworkStart = NETWORK_MODE_NONE;
 std::string gNetworkStartHost;
-int32_t gNetworkStartPort = NETWORK_DEFAULT_PORT;
+int32_t gNetworkStartPort = kNetworkDefaultPort;
 std::string gNetworkStartAddress;
 
 static uint32_t _port = 0;
diff --git a/src/openrct2/command_line/UriHandler.cpp b/src/openrct2/command_line/UriHandler.cpp
index 8ba169609e..9d286b57c2 100644
--- a/src/openrct2/command_line/UriHandler.cpp
+++ b/src/openrct2/command_line/UriHandler.cpp
@@ -60,7 +60,7 @@ static exitcode_t HandleUriJoin(const std::vector<std::string>& args)
 {
     std::string hostname;
     int32_t port;
-    if (args.size() > 1 && TryParseHostnamePort(args[1], &hostname, &port, NETWORK_DEFAULT_PORT))
+    if (args.size() > 1 && TryParseHostnamePort(args[1], &hostname, &port, kNetworkDefaultPort))
     {
         // Set the network start configuration
         gNetworkStart = NETWORK_MODE_CLIENT;
diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
index 956511edfb..67fc9c4335 100644
--- a/src/openrct2/config/Config.cpp
+++ b/src/openrct2/config/Config.cpp
@@ -422,7 +422,7 @@ namespace Config
 
             auto model = &gConfigNetwork;
             model->PlayerName = std::move(playerName);
-            model->DefaultPort = reader->GetInt32("default_port", NETWORK_DEFAULT_PORT);
+            model->DefaultPort = reader->GetInt32("default_port", kNetworkDefaultPort);
             model->ListenAddress = reader->GetString("listen_address", "");
             model->DefaultPassword = reader->GetString("default_password", "");
             model->StayConnected = reader->GetBoolean("stay_connected", true);
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index 7e9494644c..0494e7dad5 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#define NETWORK_DEFAULT_PORT 11753
+constexpr int16_t kNetworkDefaultPort = 11753;
 #define NETWORK_LAN_BROADCAST_PORT 11754
 #define NETWORK_LAN_BROADCAST_MSG "openrct2.server.query"
 #define MAX_SERVER_DESCRIPTION_LENGTH 256