mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Part of #21421: apply more clang-formatting

This commit is contained in:
Claudio Tiecher 2024-03-25 16:56:04 +01:00
parent 5d2ecf71e5
commit 4d99fec550
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,7 +691,8 @@ static constexpr ScreenCoordsXY MiniMapOffsets[] = {
{
// The practical size is 2 lower than the technical size
size += 2;
size = std::clamp(size, static_cast<int>(kMinimumMapSizeTechnical), static_cast<int>(kMaximumMapSizeTechnical));
size = std::clamp(
size, static_cast<int>(kMinimumMapSizeTechnical), static_cast<int>(kMaximumMapSizeTechnical));
TileCoordsXY newMapSize = GetGameState().MapSize;
if (_resizeDirection != ResizeDirection::X)

6
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -741,8 +741,7 @@ static uint64_t PageDisabledWidgets[] = {
switch (widgetIndex)
{
case WIDX_SPINNER_X_INCREASE:
windowTileInspectorTile.x = std::min<int32_t>(
windowTileInspectorTile.x + 1, kMaximumMapSizeTechnical - 1);
windowTileInspectorTile.x = std::min<int32_t>(windowTileInspectorTile.x + 1, kMaximumMapSizeTechnical - 1);
_toolMap.x = std::min<int32_t>(_toolMap.x + 32, MAXIMUM_TILE_START_XY);
LoadTile(nullptr);
break;
@ -754,8 +753,7 @@ static uint64_t PageDisabledWidgets[] = {
break;
case WIDX_SPINNER_Y_INCREASE:
windowTileInspectorTile.y = std::min<int32_t>(
windowTileInspectorTile.y + 1, kMaximumMapSizeTechnical - 1);
windowTileInspectorTile.y = std::min<int32_t>(windowTileInspectorTile.y + 1, kMaximumMapSizeTechnical - 1);
_toolMap.y = std::min<int32_t>(_toolMap.y + 32, MAXIMUM_TILE_START_XY);
LoadTile(nullptr);
break;

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

@ -25,8 +25,8 @@ constexpr uint8_t kMaximumWaterHeight = 254;
*/
constexpr uint8_t kMapBaseZ = 7;
constexpr uint8_t kMinimumMapSizeTechnical = 5 ;
constexpr uint16_t kMaximumMapSizeTechnical = 1001 ;
constexpr uint8_t kMinimumMapSizeTechnical = 5;
constexpr uint16_t kMaximumMapSizeTechnical = 1001;
#define MINIMUM_MAP_SIZE_PRACTICAL (kMinimumMapSizeTechnical - 2)
#define MAXIMUM_MAP_SIZE_PRACTICAL (kMaximumMapSizeTechnical - 2)
constexpr const int32_t MAXIMUM_MAP_SIZE_BIG = COORDS_XY_STEP * kMaximumMapSizeTechnical;