From 5837a33a60c83a0ed572e1e34b9d2c1f2d51b3f6 Mon Sep 17 00:00:00 2001 From: Gustav Burkhardt <77353583+gwburk@users.noreply.github.com> Date: Fri, 26 Apr 2024 03:11:19 -0400 Subject: [PATCH] Part of #21421: rename MAX_VIEWPORT_COUNT to kMaxViewportCount --- src/openrct2/interface/Viewport.cpp | 2 +- src/openrct2/interface/Viewport.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index a3c02f4d96..2045ea3450 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -177,7 +177,7 @@ CoordsXYZ Focus::GetPos() const void ViewportCreate(WindowBase* w, const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, const Focus& focus) { Viewport* viewport = nullptr; - if (_viewports.size() >= MAX_VIEWPORT_COUNT) + if (_viewports.size() >= kMaxViewportCount) { LOG_ERROR("No more viewport slots left to allocate."); return; diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 117ef53342..9681dcd081 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -114,7 +114,7 @@ struct InteractionInfo ViewportInteractionItem SpriteType = ViewportInteractionItem::None; }; -#define MAX_VIEWPORT_COUNT WINDOW_LIMIT_MAX +constexpr int32_t kMaxViewportCount = WINDOW_LIMIT_MAX; /** * A reference counter for whether something is forcing the grid lines to show. When the counter