diff --git a/src/openrct2/rct1/Limits.h b/src/openrct2/rct1/Limits.h index 5aff29068d..33dcda4c7c 100644 --- a/src/openrct2/rct1/Limits.h +++ b/src/openrct2/rct1/Limits.h @@ -13,7 +13,7 @@ namespace RCT1::Limits { using namespace RCT12::Limits; - constexpr uint16_t MaxTileElements = 0xC000; + constexpr uint16_t kMaxTileElements = 0xC000; constexpr uint16_t MaxEntities = 5000; constexpr uint8_t kMaxTrainsPerRide = 12; constexpr uint8_t MaxMapSize = 128; diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 8ed1bbc09c..438be07ad5 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -731,7 +731,7 @@ namespace RCT1 uint32_t Ticks; uint32_t RandomA; uint32_t RandomB; - RCT12TileElement TileElements[Limits::MaxTileElements]; + RCT12TileElement TileElements[Limits::kMaxTileElements]; uint32_t UnkCounter; Entity Entities[Limits::MaxEntities]; uint16_t NextEntityIndex; diff --git a/src/openrct2/rct2/Limits.h b/src/openrct2/rct2/Limits.h index e3556425e7..dd068fa0a7 100644 --- a/src/openrct2/rct2/Limits.h +++ b/src/openrct2/rct2/Limits.h @@ -20,7 +20,7 @@ namespace RCT2::Limits constexpr uint8_t kDowntimeHistorySize = 8; constexpr uint16_t MaxEntities = 10000; constexpr uint16_t MaxEntitiesRCTCExtended = 15000; // Used in files marked with “classic flag” 0xF - constexpr uint32_t MaxTileElements = 0x30000; + constexpr uint32_t kMaxTileElements = 0x30000; constexpr uint16_t MaxAnimatedObjects = 2000; constexpr uint8_t MaxResearchedRideTypeQuads = 8; // With 32 bits per uint32_t, this means there is room for // 256 types. diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 617177baa6..d838e975b5 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -842,7 +842,7 @@ namespace RCT2 uint32_t ScenarioSrand1; // SC6[5] - RCT12TileElement TileElements[Limits::MaxTileElements]; + RCT12TileElement TileElements[Limits::kMaxTileElements]; // SC6[6] uint32_t NextFreeTileElementPointerIndex;