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 MaxCircuitsPerRide to kMaxCircuitsPerRide

Browse Source
This commit is contained in:
Harry-Hopkinson
2024-05-27 07:38:57 +00:00
parent a7be543fc3
commit 1cca5d7ec3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Ride.cpp
View File

@@ -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,

2
src/openrct2/Limits.h
View File

@@ -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;

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

@@ -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;
}