From 2a027f4269230f9b5daf3ffeac8bbf1858b46fee Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Mon, 27 May 2024 08:31:07 +0000 Subject: [PATCH] Rename CheatsMaxOperatingLimit to kCheatsMaxOperatingLimit --- src/openrct2-ui/windows/Ride.cpp | 16 ++++++++-------- src/openrct2/Limits.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 18fa8461dc..ddcebbfc03 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2984,7 +2984,7 @@ static_assert(std::size(RatingNames) == 6); if (GetGameState().Cheats.UnlockOperatingLimits) { - maxValue = OpenRCT2::Limits::CheatsMaxOperatingLimit; + maxValue = OpenRCT2::Limits::kCheatsMaxOperatingLimit; } uint8_t increment = ride->mode == RideMode::Dodgems ? 10 : 1; @@ -3004,7 +3004,7 @@ static_assert(std::size(RatingNames) == 6); uint8_t minValue = GetGameState().Cheats.UnlockOperatingLimits ? 0 : operatingSettings.MinValue; if (GetGameState().Cheats.UnlockOperatingLimits) { - maxValue = OpenRCT2::Limits::CheatsMaxOperatingLimit; + maxValue = OpenRCT2::Limits::kCheatsMaxOperatingLimit; } uint8_t decrement = ride->mode == RideMode::Dodgems ? 10 : 1; @@ -3140,7 +3140,7 @@ static_assert(std::size(RatingNames) == 6); break; case WIDX_LIFT_HILL_SPEED_INCREASE: upperBound = GetGameState().Cheats.UnlockOperatingLimits - ? OpenRCT2::Limits::CheatsMaxOperatingLimit + ? OpenRCT2::Limits::kCheatsMaxOperatingLimit : ride->GetRideTypeDescriptor().LiftData.maximum_speed; lowerBound = GetGameState().Cheats.UnlockOperatingLimits ? 0 @@ -3151,7 +3151,7 @@ static_assert(std::size(RatingNames) == 6); break; case WIDX_LIFT_HILL_SPEED_DECREASE: upperBound = GetGameState().Cheats.UnlockOperatingLimits - ? OpenRCT2::Limits::CheatsMaxOperatingLimit + ? OpenRCT2::Limits::kCheatsMaxOperatingLimit : ride->GetRideTypeDescriptor().LiftData.maximum_speed; lowerBound = GetGameState().Cheats.UnlockOperatingLimits ? 0 @@ -3201,7 +3201,7 @@ static_assert(std::size(RatingNames) == 6); LoadDropdown(&widgets[widgetIndex]); break; case WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE: - upperBound = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit + upperBound = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::kCheatsMaxOperatingLimit : OpenRCT2::Limits::kMaxCircuitsPerRide; lowerBound = 1; SetOperatingSetting( @@ -3209,7 +3209,7 @@ static_assert(std::size(RatingNames) == 6); std::clamp(ride->num_circuits + 1, lowerBound, upperBound)); break; case WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE: - upperBound = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit + upperBound = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::kCheatsMaxOperatingLimit : OpenRCT2::Limits::kMaxCircuitsPerRide; lowerBound = 1; SetOperatingSetting( @@ -3253,7 +3253,7 @@ static_assert(std::size(RatingNames) == 6); } const auto& operatingSettings = ride.GetRideTypeDescriptor().OperatingSettings; - int16_t maxValue = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit + int16_t maxValue = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::kCheatsMaxOperatingLimit : operatingSettings.MaxValue; int16_t minValue = GetGameState().Cheats.UnlockOperatingLimits ? 0 : operatingSettings.MinValue; @@ -3335,7 +3335,7 @@ static_assert(std::size(RatingNames) == 6); if (widgetIndex == WIDX_MODE_TWEAK) { const auto& operatingSettings = ride->GetRideTypeDescriptor().OperatingSettings; - uint32_t maxValue = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit + uint32_t maxValue = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::kCheatsMaxOperatingLimit : operatingSettings.MaxValue; uint32_t minValue = GetGameState().Cheats.UnlockOperatingLimits ? 0 : operatingSettings.MinValue; auto multiplier = ride->GetRideTypeDescriptor().OperatingSettings.OperatingSettingMultiplier; diff --git a/src/openrct2/Limits.h b/src/openrct2/Limits.h index 8eadabe286..90d407bce3 100644 --- a/src/openrct2/Limits.h +++ b/src/openrct2/Limits.h @@ -34,5 +34,5 @@ namespace OpenRCT2::Limits constexpr uint16_t kMaxPeepSpawns = 256; constexpr uint16_t kMaxParkEntrances = 256; constexpr uint8_t kMaxWaitingTime = RCT12::Limits::kMaxWaitingTime; - constexpr uint8_t CheatsMaxOperatingLimit = 255; + constexpr uint8_t kCheatsMaxOperatingLimit = 255; } // namespace OpenRCT2::Limits