From ef81a6376e1e8345c9ecc1a8976b92a4620e1fe5 Mon Sep 17 00:00:00 2001 From: Claudio Tiecher Date: Sun, 17 Mar 2024 14:38:21 +0100 Subject: [PATCH] Part of #21421: Refactor MINIMUM_MAP_SIZE_TECHNICAL --- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/MapGen.cpp | 4 ++-- src/openrct2/actions/MapChangeSizeAction.cpp | 2 +- src/openrct2/world/Map.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 554c4a8e4e..b2afdc70a1 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -691,7 +691,7 @@ static constexpr ScreenCoordsXY MiniMapOffsets[] = { { // The practical size is 2 lower than the technical size size += 2; - size = std::clamp(size, MINIMUM_MAP_SIZE_TECHNICAL, MAXIMUM_MAP_SIZE_TECHNICAL); + size = std::clamp(size, kMinimumMapSizeTechnical, MAXIMUM_MAP_SIZE_TECHNICAL); TileCoordsXY newMapSize = GetGameState().MapSize; if (_resizeDirection != ResizeDirection::X) diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 89e7943a85..791b07afb6 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -405,9 +405,9 @@ static uint64_t PressedWidgets[WINDOW_MAPGEN_PAGE_COUNT] = { _resizeDirection = ResizeDirection::Both; if (_resizeDirection != ResizeDirection::X) - _mapSize.y = std::clamp(_mapSize.y + sizeOffset, MINIMUM_MAP_SIZE_TECHNICAL, MAXIMUM_MAP_SIZE_TECHNICAL); + _mapSize.y = std::clamp(_mapSize.y + sizeOffset, kMinimumMapSizeTechnical, MAXIMUM_MAP_SIZE_TECHNICAL); if (_resizeDirection != ResizeDirection::Y) - _mapSize.x = std::clamp(_mapSize.x + sizeOffset, MINIMUM_MAP_SIZE_TECHNICAL, MAXIMUM_MAP_SIZE_TECHNICAL); + _mapSize.x = std::clamp(_mapSize.x + sizeOffset, kMinimumMapSizeTechnical, MAXIMUM_MAP_SIZE_TECHNICAL); } void InputMapSize(WidgetIndex callingWidget, int32_t currentValue) diff --git a/src/openrct2/actions/MapChangeSizeAction.cpp b/src/openrct2/actions/MapChangeSizeAction.cpp index 9ceeb8711e..bcd6b1a433 100644 --- a/src/openrct2/actions/MapChangeSizeAction.cpp +++ b/src/openrct2/actions/MapChangeSizeAction.cpp @@ -39,7 +39,7 @@ GameActions::Result MapChangeSizeAction::Query() const { return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_INCREASE_MAP_SIZE_ANY_FURTHER, STR_NONE); } - if (_targetSize.x < MINIMUM_MAP_SIZE_TECHNICAL || _targetSize.y < MINIMUM_MAP_SIZE_TECHNICAL) + if (_targetSize.x < kMinimumMapSizeTechnical || _targetSize.y < kMinimumMapSizeTechnical) { return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_DECREASE_MAP_SIZE_ANY_FURTHER, STR_NONE); } diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 837fcad2ae..99afb700b1 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -25,9 +25,9 @@ constexpr uint8_t kMaximumWaterHeight = 254; */ constexpr uint8_t kMapBaseZ = 7; -#define MINIMUM_MAP_SIZE_TECHNICAL 5 +constexpr uint8_t kMinimumMapSizeTechnical{ 5 }; #define MAXIMUM_MAP_SIZE_TECHNICAL 1001 -#define MINIMUM_MAP_SIZE_PRACTICAL (MINIMUM_MAP_SIZE_TECHNICAL - 2) +#define MINIMUM_MAP_SIZE_PRACTICAL (kMinimumMapSizeTechnical - 2) #define MAXIMUM_MAP_SIZE_PRACTICAL (MAXIMUM_MAP_SIZE_TECHNICAL - 2) constexpr const int32_t MAXIMUM_MAP_SIZE_BIG = COORDS_XY_STEP * MAXIMUM_MAP_SIZE_TECHNICAL; constexpr int32_t MAXIMUM_TILE_START_XY = MAXIMUM_MAP_SIZE_BIG - COORDS_XY_STEP;