From 74513374d1190ca218e31e6fa4bc7547bbc617d1 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:28:58 +0000 Subject: [PATCH] Rename MAX_SERVER_DESCRIPTION_LENGTH to kMaxServerDescriptionLength --- src/openrct2-ui/windows/ServerStart.cpp | 4 ++-- src/openrct2/network/network.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index fcad422072..e7fa38135c 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -101,7 +101,7 @@ static Widget _windowServerStartWidgets[] = { WindowStartTextbox(*this, widgetIndex, _name, 64); break; case WIDX_DESCRIPTION_INPUT: - WindowStartTextbox(*this, widgetIndex, _description, MAX_SERVER_DESCRIPTION_LENGTH); + WindowStartTextbox(*this, widgetIndex, _description, kMaxServerDescriptionLength); break; case WIDX_GREETING_INPUT: WindowStartTextbox(*this, widgetIndex, _greeting, kChatInputSize); @@ -258,7 +258,7 @@ static Widget _windowServerStartWidgets[] = { private: char _port[7]; char _name[65]; - char _description[MAX_SERVER_DESCRIPTION_LENGTH]; + char _description[kMaxServerDescriptionLength]; char _greeting[kChatInputSize]; char _password[33]; static void ScenarioSelectCallback(const utf8* path) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 320b7b32e3..d5de1bffec 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -9,10 +9,12 @@ #pragma once +#include + constexpr uint16_t kNetworkDefaultPort = 11753; constexpr uint16_t kNetworkLanBroadcastPort = 11754; constexpr const char* kNetworkLanBroadcastMsg = "openrct2.server.query"; -#define MAX_SERVER_DESCRIPTION_LENGTH 256 +constexpr uint16_t kMaxServerDescriptionLength = 256; #include "../Game.h" #include "../common.h"