1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00

Rename MaxEntitiesFlag15 to MaxEntitiesRCTCExtended

This commit is contained in:
Gymnasiast
2022-08-31 22:45:13 +02:00
parent b837cea59b
commit d8b5932a5e
3 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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<uint8_t>(EntityListId::Count)];
uint16_t sprite_lists_count[static_cast<uint8_t>(EntityListId::Count)];
StringId park_name;

View File

@@ -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<typename OpenRCT2_T> void ImportEntity(const RCT12SpriteBase& src);