mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Rename MaxEntities to kMaxEntities

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-06-05 20:24:33 +00:00
committed by Harry Hopkinson
parent a4d6f6a377
commit 15abd43c1b
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/rct1/Limits.h
View File

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

2
src/openrct2/rct1/RCT1.h
View File

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

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -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);
}

2
src/openrct2/rct2/Limits.h
View File

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

2
src/openrct2/rct2/S6Importer.cpp
View File

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