mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Apply formating

Browse Source
This commit is contained in:
duncanspumpkin
2023-06-23 08:35:55 +01:00
parent ed5abfc7de
commit 697712c352
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1836,8 +1836,7 @@ private:
WindowDropdownShowText( WindowDropdownShowText(
{ windowPos.x + widget->left, windowPos.y + widget->top }, widget->height() + 1, colours[1], 0, 2); { windowPos.x + widget->left, windowPos.y + widget->top }, widget->height() + 1, colours[1], 0, 2);
gDropdownDefaultIndex = 0; gDropdownDefaultIndex = 0;
if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK) || _viewIndex == 0 if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_TRACK) || _viewIndex == 0 || _viewIndex > ride->NumTrains)
|| _viewIndex > ride->NumTrains)
{ {
// Disable if we're a flat ride, 'overall view' is selected or a station is selected // Disable if we're a flat ride, 'overall view' is selected or a station is selected
Dropdown::SetDisabled(1, true); Dropdown::SetDisabled(1, true);
@@ -3038,7 +3037,7 @@ private:
break; break;
case WIDX_LIFT_HILL_SPEED_INCREASE: case WIDX_LIFT_HILL_SPEED_INCREASE:
upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit
: ride->GetRideTypeDescriptor().LiftData.maximum_speed; : ride->GetRideTypeDescriptor().LiftData.maximum_speed;
lowerBound = gCheatsUnlockOperatingLimits ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed; lowerBound = gCheatsUnlockOperatingLimits ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed;
SetOperatingSetting( SetOperatingSetting(
rideId, RideSetSetting::LiftHillSpeed, rideId, RideSetSetting::LiftHillSpeed,
@@ -3046,7 +3045,7 @@ private:
break; break;
case WIDX_LIFT_HILL_SPEED_DECREASE: case WIDX_LIFT_HILL_SPEED_DECREASE:
upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit
: ride->GetRideTypeDescriptor().LiftData.maximum_speed; : ride->GetRideTypeDescriptor().LiftData.maximum_speed;
lowerBound = gCheatsUnlockOperatingLimits ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed; lowerBound = gCheatsUnlockOperatingLimits ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed;
SetOperatingSetting( SetOperatingSetting(
rideId, RideSetSetting::LiftHillSpeed, rideId, RideSetSetting::LiftHillSpeed,
@@ -3094,14 +3093,14 @@ private:
break; break;
case WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE: case WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE:
upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit
: OpenRCT2::Limits::MaxCircuitsPerRide; : OpenRCT2::Limits::MaxCircuitsPerRide;
lowerBound = 1; lowerBound = 1;
SetOperatingSetting( SetOperatingSetting(
rideId, RideSetSetting::NumCircuits, std::clamp<int16_t>(ride->num_circuits + 1, lowerBound, upperBound)); rideId, RideSetSetting::NumCircuits, std::clamp<int16_t>(ride->num_circuits + 1, lowerBound, upperBound));
break; break;
case WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE: case WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE:
upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit upperBound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit
: OpenRCT2::Limits::MaxCircuitsPerRide; : OpenRCT2::Limits::MaxCircuitsPerRide;
lowerBound = 1; lowerBound = 1;
SetOperatingSetting( SetOperatingSetting(
rideId, RideSetSetting::NumCircuits, std::clamp<int16_t>(ride->num_circuits - 1, lowerBound, upperBound)); rideId, RideSetSetting::NumCircuits, std::clamp<int16_t>(ride->num_circuits - 1, lowerBound, upperBound));