diff --git a/src/openrct2/Limits.h b/src/openrct2/Limits.h index 7e821f1372..e6605d76a1 100644 --- a/src/openrct2/Limits.h +++ b/src/openrct2/Limits.h @@ -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; diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 876cf2fbed..728bc8f3de 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -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; diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 07a87f06df..7d2a8a69fa 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -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, ¤tAwards](Award& award) { if (award.Time != 0) { diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 9e8c9204e7..bbc01a208e 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -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; diff --git a/src/openrct2/rct12/Limits.h b/src/openrct2/rct12/Limits.h index 95b803f421..6e446cad42 100644 --- a/src/openrct2/rct12/Limits.h +++ b/src/openrct2/rct12/Limits.h @@ -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; diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 8f62ab55f9..fcd70d71ea 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -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;