diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index a854f4a5c0..fdc9baa9e8 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -3202,7 +3202,7 @@ static_assert(std::size(RatingNames) == 6); break; case WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE: upperBound = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit - : OpenRCT2::Limits::MaxCircuitsPerRide; + : OpenRCT2::Limits::kMaxCircuitsPerRide; lowerBound = 1; SetOperatingSetting( rideId, RideSetSetting::NumCircuits, @@ -3210,7 +3210,7 @@ static_assert(std::size(RatingNames) == 6); break; case WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE: upperBound = GetGameState().Cheats.UnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit - : OpenRCT2::Limits::MaxCircuitsPerRide; + : OpenRCT2::Limits::kMaxCircuitsPerRide; lowerBound = 1; SetOperatingSetting( rideId, RideSetSetting::NumCircuits, diff --git a/src/openrct2/Limits.h b/src/openrct2/Limits.h index e5e6ec3e1c..7e821f1372 100644 --- a/src/openrct2/Limits.h +++ b/src/openrct2/Limits.h @@ -27,7 +27,7 @@ namespace OpenRCT2::Limits // hence the usage of static asserts. static_assert(kMaxVehicleColours >= kMaxTrainsPerRide); static_assert(kMaxVehicleColours >= kMaxCarsPerTrain); - constexpr uint8_t MaxCircuitsPerRide = 20; + constexpr uint8_t kMaxCircuitsPerRide = 20; constexpr uint8_t MaxAwards = RCT12::Limits::MaxAwards; constexpr uint8_t NumColourSchemes = RCT12::Limits::NumColourSchemes; constexpr uint8_t DowntimeHistorySize = RCT2::Limits::DowntimeHistorySize; diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index 8a8a8a12c8..a40aca3cb6 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -268,7 +268,7 @@ bool RideSetSettingAction::RideIsValidLiftHillSpeed(const Ride& ride) const bool RideSetSettingAction::RideIsValidNumCircuits() const { int32_t minNumCircuits = 1; - int32_t maxNumCircuits = GetGameState().Cheats.UnlockOperatingLimits ? 255 : Limits::MaxCircuitsPerRide; + int32_t maxNumCircuits = GetGameState().Cheats.UnlockOperatingLimits ? 255 : Limits::kMaxCircuitsPerRide; return _value >= minNumCircuits && _value <= maxNumCircuits; }