From eb4c64abc4896066e8256a5ad309a78c6f2da4e1 Mon Sep 17 00:00:00 2001 From: Claudio Tiecher Date: Sat, 23 Mar 2024 10:38:16 +0100 Subject: [PATCH] Part of #21421: improved consistency for var decl --- src/openrct2/world/Map.h | 4 ++-- src/openrct2/world/TileElement.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 184ec86314..917337ad7f 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -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; diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index 73fc8046fc..cf865d6256 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -700,9 +700,9 @@ enum MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT = (1 << 7), }; -constexpr uint8_t kTileElementQuadrantMask{ 0b11000000 }; -constexpr uint8_t kTileElementTypeMask{ 0b00111100 }; -constexpr uint8_t kTileElementDirectionMask{ 0b00000011 }; +constexpr uint8_t kTileElementQuadrantMask = 0b11000000; +constexpr uint8_t kTileElementTypeMask = 0b00111100; +constexpr uint8_t kTileElementDirectionMask = 0b00000011; #define TILE_ELEMENT_OCCUPIED_QUADRANTS_MASK 0b00001111 enum