diff --git a/src/openrct2/rct2/Limits.h b/src/openrct2/rct2/Limits.h index 36b94e6244..ef690e574e 100644 --- a/src/openrct2/rct2/Limits.h +++ b/src/openrct2/rct2/Limits.h @@ -18,7 +18,7 @@ namespace RCT2::Limits constexpr const uint8_t MaxTrainsPerRide = 32; constexpr const uint8_t DowntimeHistorySize = 8; constexpr const uint16_t MaxEntities = 10000; - constexpr const uint16_t MaxEntitiesFlag15 = 15000; + constexpr const uint16_t MaxEntitiesRCTCExtended = 15000; // Used in files marked with “classic flag” 0xF constexpr const uint32_t MaxTileElements = 0x30000; constexpr const uint16_t MaxAnimatedObjects = 2000; constexpr const uint8_t MaxResearchedRideTypeQuads = 8; // With 32 bits per uint32_t, this means there is room for diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index c72db15186..e669d3e354 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -834,7 +834,7 @@ namespace RCT2 // SC6[6] uint32_t next_free_tile_element_pointer_index; - Entity sprites[Limits::MaxEntitiesFlag15]; + Entity sprites[Limits::MaxEntitiesRCTCExtended]; uint16_t sprite_lists_head[static_cast(EntityListId::Count)]; uint16_t sprite_lists_count[static_cast(EntityListId::Count)]; StringId park_name; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index c38b5454e6..a838d18152 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1613,7 +1613,7 @@ namespace RCT2 uint16_t GetMaxEntities() { - return (_s6.header.classic_flag == 0xf) ? Limits::MaxEntitiesFlag15 : Limits::MaxEntities; + return (_s6.header.classic_flag == 0xf) ? Limits::MaxEntitiesRCTCExtended : Limits::MaxEntities; } template void ImportEntity(const RCT12SpriteBase& src);