From 343b10c17260f76df57a926d4f09519c1e853de9 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 15:28:16 +0000 Subject: [PATCH 1/8] Rename WINDOW_LIMIT_MIN to kWindowLimitMin --- src/openrct2/interface/Window.cpp | 2 +- src/openrct2/interface/Window.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 80e4f3256c..b01b5a1bf0 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -194,7 +194,7 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification) void WindowSetWindowLimit(int32_t value) { int32_t prev = gConfigGeneral.WindowLimit; - int32_t val = std::clamp(value, WINDOW_LIMIT_MIN, WINDOW_LIMIT_MAX); + int32_t val = std::clamp(value, kWindowLimitMin, WINDOW_LIMIT_MAX); gConfigGeneral.WindowLimit = val; ConfigSaveDefault(); // Checks if value decreases and then closes surplus diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 814a6600e8..1e3b50c76f 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -482,7 +482,7 @@ enum class Tool using modal_callback = void (*)(int32_t result); using close_callback = void (*)(); -#define WINDOW_LIMIT_MIN 4 +constexpr int8_t kWindowLimitMin = 4; #define WINDOW_LIMIT_MAX 64 #define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc. From 9e2b45fab3878f7c88aa435846ff6a0db69bcfd6 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 15:35:42 +0000 Subject: [PATCH 2/8] Rename WINDOW_LIMIT_MAX to kWindowLimitMax --- src/openrct2/config/Config.cpp | 2 +- src/openrct2/interface/Viewport.h | 2 +- src/openrct2/interface/Window.cpp | 2 +- src/openrct2/interface/Window.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 5153cb83cb..956511edfb 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -217,7 +217,7 @@ namespace Config model->LastSaveScenarioDirectory = reader->GetString("last_scenario_directory", ""); model->LastSaveTrackDirectory = reader->GetString("last_track_directory", ""); model->UseNativeBrowseDialog = reader->GetBoolean("use_native_browse_dialog", false); - model->WindowLimit = reader->GetInt32("window_limit", WINDOW_LIMIT_MAX); + model->WindowLimit = reader->GetInt32("window_limit", kWindowLimitMax); model->ZoomToCursor = reader->GetBoolean("zoom_to_cursor", true); model->RenderWeatherEffects = reader->GetBoolean("render_weather_effects", true); model->RenderWeatherGloom = reader->GetBoolean("render_weather_gloom", true); diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 9681dcd081..0366976024 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -114,7 +114,7 @@ struct InteractionInfo ViewportInteractionItem SpriteType = ViewportInteractionItem::None; }; -constexpr int32_t kMaxViewportCount = WINDOW_LIMIT_MAX; +constexpr int32_t kMaxViewportCount = kWindowLimitMax; /** * A reference counter for whether something is forcing the grid lines to show. When the counter diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index b01b5a1bf0..8718d33891 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -194,7 +194,7 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification) void WindowSetWindowLimit(int32_t value) { int32_t prev = gConfigGeneral.WindowLimit; - int32_t val = std::clamp(value, kWindowLimitMin, WINDOW_LIMIT_MAX); + int32_t val = std::clamp(value, kWindowLimitMin, kWindowLimitMax); gConfigGeneral.WindowLimit = val; ConfigSaveDefault(); // Checks if value decreases and then closes surplus diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 1e3b50c76f..bf023a396e 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -483,7 +483,7 @@ using modal_callback = void (*)(int32_t result); using close_callback = void (*)(); constexpr int8_t kWindowLimitMin = 4; -#define WINDOW_LIMIT_MAX 64 +constexpr int8_t kWindowLimitMax = 64; #define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc. extern WindowBase* gWindowAudioExclusive; From 8ce6ba7606608dae54369bb0ad4e5b3e7034924d Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 15:51:20 +0000 Subject: [PATCH 3/8] Rename WINDOW_LIMIT_RESERVED to kWindowLimitReserved --- src/openrct2-ui/interface/Window.cpp | 4 ++-- src/openrct2/interface/Window.cpp | 2 +- src/openrct2/interface/Window.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index f80393b5bf..3ae2a9ed1f 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -224,8 +224,8 @@ WindowBase* WindowCreate( } // Check if there are any window slots left - // include WINDOW_LIMIT_RESERVED for items such as the main viewport and toolbars to not appear to be counted. - if (g_window_list.size() >= static_cast(gConfigGeneral.WindowLimit + WINDOW_LIMIT_RESERVED)) + // include kWindowLimitReserved for items such as the main viewport and toolbars to not appear to be counted. + if (g_window_list.size() >= static_cast(gConfigGeneral.WindowLimit + kWindowLimitReserved)) { // Close least recently used window for (auto& w : g_window_list) diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 8718d33891..52cc76ef1b 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -164,7 +164,7 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification) // find the amount of windows that are currently open auto count = static_cast(g_window_list.size()); // difference between amount open and cap = amount to close - auto diff = count - WINDOW_LIMIT_RESERVED - cap; + auto diff = count - kWindowLimitReserved - cap; for (auto i = 0; i < diff; i++) { // iterates through the list until it finds the newest window, or a window that can be closed diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index bf023a396e..1e58689a92 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -484,7 +484,7 @@ using close_callback = void (*)(); constexpr int8_t kWindowLimitMin = 4; constexpr int8_t kWindowLimitMax = 64; -#define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc. +constexpr int8_t kWindowLimitReserved = 4; // Used to reserve room for the main viewport, toolbars, etc. extern WindowBase* gWindowAudioExclusive; From ef7d7575de2391f433688e34c6a919350fca82d0 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:03:53 +0000 Subject: [PATCH 4/8] Rename PALETTE_TOTAL_OFFSETS to kPaletteTotalOffsets --- src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp | 4 ++-- src/openrct2/drawing/Drawing.cpp | 4 ++-- src/openrct2/drawing/Drawing.h | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp index bbfad0be1e..45e98a437b 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp @@ -216,7 +216,7 @@ void TextureCache::CreateTextures() void TextureCache::GeneratePaletteTexture() { - static_assert(PALETTE_TOTAL_OFFSETS + 5 < 256, "Height of palette too large!"); + static_assert(kPaletteTotalOffsets + 5 < 256, "Height of palette too large!"); constexpr int32_t height = 256; constexpr int32_t width = height; DrawPixelInfo dpi = CreateDPI(width, height); @@ -227,7 +227,7 @@ void TextureCache::GeneratePaletteTexture() dpi.bits[i] = i; } - for (int i = 0; i < PALETTE_TOTAL_OFFSETS; ++i) + for (int i = 0; i < kPaletteTotalOffsets; ++i) { GLint y = PaletteToY(static_cast(i)); diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 655e4748fe..9f73daa40c 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -405,7 +405,7 @@ const FilterPaletteID GlassPaletteIds[COLOUR_COUNT] = { }; // Previously 0x97FCBC use it to get the correct palette from g1_elements -static constexpr uint16_t palette_to_g1_offset[PALETTE_TOTAL_OFFSETS] = { +static constexpr uint16_t palette_to_g1_offset[kPaletteTotalOffsets] = { SPR_PALETTE_BLACK, SPR_PALETTE_GREY, SPR_PALETTE_WHITE, @@ -904,7 +904,7 @@ void GfxDrawPickedUpPeep(DrawPixelInfo& dpi) std::optional GetPaletteG1Index(colour_t paletteId) { - if (paletteId < PALETTE_TOTAL_OFFSETS) + if (paletteId < kPaletteTotalOffsets) { return palette_to_g1_offset[paletteId]; } diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index a4225bd0f0..b787dbcaf8 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -504,8 +504,7 @@ void FASTCALL BlitPixels(const uint8_t* src, uint8_t* dst, const PaletteMap& pal } } -#define PALETTE_TO_G1_OFFSET_COUNT 144 -constexpr uint8_t PALETTE_TOTAL_OFFSETS = 192; +constexpr uint8_t kPaletteTotalOffsets = 192; #define INSET_RECT_F_30 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_NONE) #define INSET_RECT_F_60 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_DONT_LIGHTEN) From 5ef115941d65c78e7f19dde437878a1d038a555b Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:14:19 +0000 Subject: [PATCH 5/8] 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& 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 From 82c31b80d4992f45f9eee29bdae506b473bd9b91 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:21:36 +0000 Subject: [PATCH 6/8] Rename NETWORK_LAN_BROADCAST_PORT to kNetworkLanBroadcastPort --- src/openrct2/network/NetworkServerAdvertiser.cpp | 2 +- src/openrct2/network/ServerList.cpp | 2 +- src/openrct2/network/network.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index c0b2290cb9..1ec59ff199 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -107,7 +107,7 @@ private: { if (_lanListener->GetStatus() != SocketStatus::Listening) { - _lanListener->Listen(NETWORK_LAN_BROADCAST_PORT); + _lanListener->Listen(kNetworkLanBroadcastPort); } else { diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index ddce6146e9..0ab21ea663 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -274,7 +274,7 @@ std::future> ServerList::FetchLocalServerListAsync( auto udpSocket = CreateUdpSocket(); LOG_VERBOSE("Broadcasting %zu bytes to the LAN (%s)", msg.size(), broadcastAddress.c_str()); - auto len = udpSocket->SendData(broadcastAddress, NETWORK_LAN_BROADCAST_PORT, msg.data(), msg.size()); + auto len = udpSocket->SendData(broadcastAddress, kNetworkLanBroadcastPort, msg.data(), msg.size()); if (len != msg.size()) { throw std::runtime_error("Unable to broadcast server query."); diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 0494e7dad5..9016ce78cf 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -9,8 +9,8 @@ #pragma once -constexpr int16_t kNetworkDefaultPort = 11753; -#define NETWORK_LAN_BROADCAST_PORT 11754 +constexpr uint16_t kNetworkDefaultPort = 11753; +constexpr uint16_t kNetworkLanBroadcastPort = 11754; #define NETWORK_LAN_BROADCAST_MSG "openrct2.server.query" #define MAX_SERVER_DESCRIPTION_LENGTH 256 From 7aed4d18f2d6ee7f4e6ce12b55e1e17338f0123c Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:25:10 +0000 Subject: [PATCH 7/8] 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" From 74513374d1190ca218e31e6fa4bc7547bbc617d1 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Fri, 26 Apr 2024 16:28:58 +0000 Subject: [PATCH 8/8] 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"