diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index f195255dbe..37b89d6a2f 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -3411,7 +3411,7 @@ static_assert(std::size(RatingNames) == 6); const auto& rtd = ride->GetRideTypeDescriptor(); bool hasAlternativeType = rtd.HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE); if (rtd.TrackPaintFunctions.Regular.SupportsTrackGroup(TrackGroup::liftHill) - || (hasAlternativeType && rtd.InvertedTrackPaintFunctions.SupportsTrackGroup(TrackGroup::liftHill))) + || (hasAlternativeType && rtd.InvertedTrackPaintFunctions.Regular.SupportsTrackGroup(TrackGroup::liftHill))) { widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WindowWidgetType::Label; widgets[WIDX_LIFT_HILL_SPEED].type = WindowWidgetType::Spinner; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 7b012e23db..bc342a68ad 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1695,7 +1695,7 @@ static Widget _rideConstructionWidgets[] = { widgets[WIDX_SLOPE_DOWN_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP; widgets[WIDX_SLOPE_UP_STEEP].image = ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP); widgets[WIDX_SLOPE_UP_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP; - if (trackDrawerDescriptor.SupportsTrackGroup(TrackGroup::reverseFreefall)) + if (trackDrawerDescriptor.Regular.SupportsTrackGroup(TrackGroup::reverseFreefall)) { widgets[WIDX_LEVEL].type = WindowWidgetType::FlatBtn; widgets[WIDX_SLOPE_UP].type = WindowWidgetType::FlatBtn; diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index ad64bc245f..b175d886bb 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -433,11 +433,6 @@ bool TrackDrawerDescriptor::HasCoveredPieces() const return Covered.EnabledTrackPieces.count() > 0; } -bool TrackDrawerDescriptor::SupportsTrackGroup(const TrackGroup trackGroup) const -{ - return Regular.SupportsTrackGroup(trackGroup); -} - TrackDrawerDescriptor getTrackDrawerDescriptor(const RideTypeDescriptor& rtd, bool isInverted) { return isInverted ? rtd.InvertedTrackPaintFunctions : rtd.TrackPaintFunctions; diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 5b08e87bd3..a46161b75a 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -322,7 +322,6 @@ struct TrackDrawerDescriptor } bool HasCoveredPieces() const; - bool SupportsTrackGroup(const TrackGroup trackGroup) const; }; struct RideTypeDescriptor