mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Part of #21421: Refactor MINIMUM_MAP_SIZE_TECHNICAL

Browse Source
This commit is contained in:
Claudio Tiecher
2024-03-17 14:38:21 +01:00
parent b60483f25d
commit ef81a6376e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Map.cpp
View File

@@ -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)

4
src/openrct2-ui/windows/MapGen.cpp
View File

@@ -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)

2
src/openrct2/actions/MapChangeSizeAction.cpp
View File

@@ -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);
}

4
src/openrct2/world/Map.h
View File

@@ -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;