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

Rename MaxPeepSpawns to kMaxPeepSpawns

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-05-27 07:57:59 +00:00
parent f4ce81ac6d
commit 62618edd9f
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/Limits.h
View File

@@ -31,7 +31,7 @@ namespace OpenRCT2::Limits
constexpr uint8_t kMaxAwards = RCT12::Limits::kMaxAwards;
constexpr uint8_t kNumColourSchemes = RCT12::Limits::kNumColourSchemes;
constexpr uint8_t kDowntimeHistorySize = RCT2::Limits::kDowntimeHistorySize;
constexpr uint16_t MaxPeepSpawns = 256;
constexpr uint16_t kMaxPeepSpawns = 256;
constexpr uint16_t MaxParkEntrances = 256;
constexpr uint8_t MaxWaitingTime = RCT12::Limits::MaxWaitingTime;
constexpr uint8_t CheatsMaxOperatingLimit = 255;

2
src/openrct2/actions/PeepSpawnPlaceAction.cpp
View File

@@ -125,7 +125,7 @@ GameActions::Result PeepSpawnPlaceAction::Execute() const
}
// If we have reached our max peep spawns, remove the oldest spawns
while (gameState.PeepSpawns.size() >= Limits::MaxPeepSpawns)
while (gameState.PeepSpawns.size() >= Limits::kMaxPeepSpawns)
{
PeepSpawn oldestSpawn = *gameState.PeepSpawns.begin();
gameState.PeepSpawns.erase(gameState.PeepSpawns.begin());

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

@@ -754,7 +754,7 @@ namespace RCT1
money16 ParkEntranceFee;
Entrance ParkEntrance;
uint8_t Unk198849;
RCT12PeepSpawn PeepSpawn[Limits::MaxPeepSpawns];
RCT12PeepSpawn PeepSpawn[Limits::kMaxPeepSpawns];
uint8_t Unk198856;
uint8_t ResearchLevel;
uint32_t Unk198858;

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

@@ -1410,7 +1410,7 @@ namespace RCT1
{
auto& gameState = GetGameState();
gameState.PeepSpawns.clear();
for (size_t i = 0; i < Limits::MaxPeepSpawns; i++)
for (size_t i = 0; i < Limits::kMaxPeepSpawns; i++)
{
if (_s4.PeepSpawn[i].x != RCT12_PEEP_SPAWN_UNDEFINED)
{

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

@@ -18,7 +18,7 @@ namespace RCT12::Limits
constexpr uint8_t kMaxAwards = 4;
constexpr uint8_t MaxNewsItems = 61;
constexpr uint8_t kMaxStationsPerRide = 4;
constexpr uint8_t MaxPeepSpawns = 2;
constexpr uint8_t kMaxPeepSpawns = 2;
constexpr uint8_t MaxParkEntrances = 4;
// The number of elements in the patrol_areas array per staff member. Every bit in the array represents a 4x4 square.
// In RCT1, that's an 8-bit array. 8 * 128 = 1024 bits, which is also the number of 4x4 squares on a 128x128 map.

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

@@ -861,7 +861,7 @@ namespace RCT2
uint8_t Pad013573EE[2];
uint8_t RCT1ParkEntranceZ;
uint8_t Pad013573F1;
RCT12PeepSpawn PeepSpawns[Limits::MaxPeepSpawns];
RCT12PeepSpawn PeepSpawns[Limits::kMaxPeepSpawns];
uint8_t GuestCountChangeModifier;
uint8_t CurrentResearchLevel;
uint8_t Pad01357400[4];

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

@@ -1757,7 +1757,7 @@ namespace RCT2
auto& gameState = GetGameState();
gameState.PeepSpawns.clear();
for (size_t i = 0; i < Limits::MaxPeepSpawns; i++)
for (size_t i = 0; i < Limits::kMaxPeepSpawns; i++)
{
if (_s6.PeepSpawns[i].x != RCT12_PEEP_SPAWN_UNDEFINED)
{