From 6a095f39a5a7edfd037f2e124aae6662c1328e09 Mon Sep 17 00:00:00 2001 From: Richard Qian Date: Mon, 14 Dec 2020 17:08:58 -0600 Subject: [PATCH] Enable more cheat pieces for Splash Boats and River Rafts --- src/openrct2-ui/windows/RideConstruction.cpp | 10 ++++++---- src/openrct2/ride/water/meta/RiverRafts.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 13179e4590..f6b6756773 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2913,16 +2913,18 @@ static void window_ride_construction_update_widgets(rct_window* w) { // Enable helix window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].type = WindowWidgetType::FlatBtn; - if (rideType != RIDE_TYPE_SPLASH_BOATS) - window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::FlatBtn; + window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::FlatBtn; + if (rideType != RIDE_TYPE_SPLASH_BOATS && !gCheatsEnableAllDrawableTrackPieces) + window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::Empty; } } if (is_track_enabled(TRACK_SLOPE_STEEP)) { window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].type = WindowWidgetType::FlatBtn; - if (rideType != RIDE_TYPE_SPLASH_BOATS) - window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::FlatBtn; + window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::FlatBtn; + if (rideType == RIDE_TYPE_SPLASH_BOATS && !gCheatsEnableAllDrawableTrackPieces) + window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::Empty; } int32_t x; diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index d153f9ab63..b947579d71 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -20,7 +20,7 @@ constexpr const RideTypeDescriptor RiverRaftsRTD = SET_FIELD(AlternateType, RIDE_TYPE_NULL), SET_FIELD(Category, RIDE_CATEGORY_WATER), SET_FIELD(EnabledTrackPieces, (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE)), - SET_FIELD(ExtraTrackPieces, (1ULL << TRACK_ON_RIDE_PHOTO)), + SET_FIELD(ExtraTrackPieces, (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_ON_RIDE_PHOTO)), SET_FIELD(CoveredTrackPieces, 0), SET_FIELD(StartTrackPiece, TrackElemType::EndStation), SET_FIELD(TrackPaintFunction, get_track_paint_function_splash_boats),