diff --git a/src/openrct2/rct1/Limits.h b/src/openrct2/rct1/Limits.h index 33dcda4c7c..a758ed1a14 100644 --- a/src/openrct2/rct1/Limits.h +++ b/src/openrct2/rct1/Limits.h @@ -14,7 +14,7 @@ namespace RCT1::Limits { using namespace RCT12::Limits; constexpr uint16_t kMaxTileElements = 0xC000; - constexpr uint16_t MaxEntities = 5000; + constexpr uint16_t kMaxEntities = 5000; constexpr uint8_t kMaxTrainsPerRide = 12; constexpr uint8_t MaxMapSize = 128; constexpr uint8_t MaxStaff = 116; diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 438be07ad5..3045406105 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -733,7 +733,7 @@ namespace RCT1 uint32_t RandomB; RCT12TileElement TileElements[Limits::kMaxTileElements]; uint32_t UnkCounter; - Entity Entities[Limits::MaxEntities]; + Entity Entities[Limits::kMaxEntities]; uint16_t NextEntityIndex; uint16_t FirstVehicleEntityIndex; uint16_t FirstPeepEntityIndex; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index bdff015744..2abdf19df3 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1233,7 +1233,7 @@ namespace RCT1 void ImportEntities() { - for (int i = 0; i < Limits::MaxEntities; i++) + for (int i = 0; i < Limits::kMaxEntities; i++) { ImportEntity(_s4.Entities[i].Unknown); } diff --git a/src/openrct2/rct2/Limits.h b/src/openrct2/rct2/Limits.h index dd068fa0a7..0c836c339c 100644 --- a/src/openrct2/rct2/Limits.h +++ b/src/openrct2/rct2/Limits.h @@ -18,7 +18,7 @@ namespace RCT2::Limits constexpr uint8_t kMaxTrainsPerRide = 32; constexpr uint8_t kMaxVehicleColours = 32; constexpr uint8_t kDowntimeHistorySize = 8; - constexpr uint16_t MaxEntities = 10000; + constexpr uint16_t kMaxEntities = 10000; constexpr uint16_t MaxEntitiesRCTCExtended = 15000; // Used in files marked with “classic flag” 0xF constexpr uint32_t kMaxTileElements = 0x30000; constexpr uint16_t MaxAnimatedObjects = 2000; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index f260d1f976..d0ca5c0da7 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -2217,7 +2217,7 @@ namespace RCT2 uint16_t GetMaxEntities() { - return (_s6.Header.ClassicFlag == 0xf) ? Limits::MaxEntitiesRCTCExtended : Limits::MaxEntities; + return (_s6.Header.ClassicFlag == 0xf) ? Limits::MaxEntitiesRCTCExtended : Limits::kMaxEntities; } template void ImportEntity(const RCT12EntityBase& src);