mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Code Issues Releases Wiki Activity

Rename MaxAwards to kMaxAwards

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-05-27 07:42:25 +00:00
parent 1cca5d7ec3
commit c829854b88
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/Limits.h
View File

@@ -28,7 +28,7 @@ namespace OpenRCT2::Limits
static_assert(kMaxVehicleColours >= kMaxTrainsPerRide);
static_assert(kMaxVehicleColours >= kMaxCarsPerTrain);
constexpr uint8_t kMaxCircuitsPerRide = 20;
constexpr uint8_t MaxAwards = RCT12::Limits::MaxAwards;
constexpr uint8_t kMaxAwards = RCT12::Limits::kMaxAwards;
constexpr uint8_t NumColourSchemes = RCT12::Limits::NumColourSchemes;
constexpr uint8_t DowntimeHistorySize = RCT2::Limits::DowntimeHistorySize;
constexpr uint16_t MaxPeepSpawns = 256;

2
src/openrct2/management/Award.cpp
View File

@@ -630,7 +630,7 @@ void AwardUpdateAll()
}
// Check if there was a free award entry
if (currentAwards.size() < OpenRCT2::Limits::MaxAwards)
if (currentAwards.size() < OpenRCT2::Limits::kMaxAwards)
{
// Get a random award type not already active
AwardType awardType;

2
src/openrct2/park/ParkFile.cpp
View File

@@ -857,7 +857,7 @@ namespace OpenRCT2
auto& currentAwards = gameState.CurrentAwards;
if (version <= 6)
{
Award awards[RCT2::Limits::MaxAwards]{};
Award awards[RCT2::Limits::kMaxAwards]{};
cs.ReadWriteArray(awards, [&cs, &currentAwards](Award& award) {
if (award.Time != 0)
{

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

@@ -819,7 +819,7 @@ namespace RCT1
money32 AdmissionTotalIncome;
money32 CompanyValue;
uint8_t ThoughtTimer[16];
RCT12Award Awards[Limits::MaxAwards];
RCT12Award Awards[Limits::kMaxAwards];
money16 LandPrice;
money16 ConstructionRightsPrice;
uint16_t Unk199BCC;

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

@@ -15,7 +15,7 @@ namespace RCT12::Limits
constexpr uint8_t MaxRideObjects = 128;
constexpr uint8_t kMaxRidesInPark = 255;
constexpr uint8_t MaxAwards = 4;
constexpr uint8_t kMaxAwards = 4;
constexpr uint8_t MaxNewsItems = 61;
constexpr uint8_t kMaxStationsPerRide = 4;
constexpr uint8_t MaxPeepSpawns = 2;

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

@@ -945,7 +945,7 @@ namespace RCT2
money32 IncomeFromAdmissions;
money32 CompanyValue;
uint8_t PeepWarningThrottle[16];
RCT12Award Awards[Limits::MaxAwards];
RCT12Award Awards[Limits::kMaxAwards];
money16 LandPrice;
money16 ConstructionRightsPrice;
uint16_t Word01358774;