From e16a53df1d21a386fd319a3d80aedf693d7053e8 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 22 Feb 2020 18:47:33 +0100 Subject: [PATCH] Fix #10694: Lift hill speed of the Flying RC cannot be changed --- distribution/changelog.txt | 1 + src/openrct2-ui/windows/Ride.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 5a613b9069..4e0458c892 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -22,6 +22,7 @@ - Fix: [#10489] Hosts last player action not being synchronized. - Fix: [#10543] Secondary shop item prices are not imported correctly from RCT1 saves. - Fix: [#10547] RCT1 parks have too many rides available. +- Fix: [#10694] The lift hill speed of the flying roller coaster cannot be changed (original bug). - Fix: [#10705] Apply multithreaded rendering to all viewports. - Fix: [#10739] Mountain tool overlay for even-numbered selections. - Removed: [#6898] LOADMM and LOADRCT1 title sequence commands (use LOADSC instead). diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 92350fbcaa..6bafe7ea6d 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -3638,8 +3638,11 @@ static void window_ride_operating_invalidate(rct_window* w) | (1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) | (1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX) | (1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX)); - // Lift hill speed - if (track_piece_is_available_for_ride_type(ride->type, TRACK_LIFT_HILL)) + // Sometimes, only one of the alternatives support lift hill pieces. Make sure to check both. + bool hasAlternativeType = (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE) != 0; + if (track_piece_is_available_for_ride_type(ride->type, TRACK_LIFT_HILL) + || (hasAlternativeType + && track_piece_is_available_for_ride_type(RideData4[ride->type].alternate_type, TRACK_LIFT_HILL))) { window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WWT_LABEL; window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WWT_SPINNER;