From 6952170d4f8c1ac41fcc04089f20928fdaab8697 Mon Sep 17 00:00:00 2001 From: Spacek531 Date: Thu, 2 May 2024 15:59:14 -0700 Subject: [PATCH] remove check for reverser coaster --- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2/ride/RideData.h | 1 + src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index e48dca60f921..52f32368a971 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2946,7 +2946,7 @@ static_assert(std::size(RatingNames) == 6); y -= (carEntry.spacing / 2) / 17432; } - if (ride->type == RIDE_TYPE_REVERSER_ROLLER_COASTER) + if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_LAYERED_VEHICLE_PREVIEW)) { VehicleDrawInfo tmp = *(nextSpriteToDraw - 1); *(nextSpriteToDraw - 1) = *(nextSpriteToDraw - 2); diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 6c8c88c00c89..d914d3800c38 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -426,6 +426,7 @@ enum ride_type_flags : uint64_t RIDE_TYPE_FLAG_CHECK_FOR_STALLING = (1uLL << 27), RIDE_TYPE_FLAG_HAS_TRACK = (1uLL << 28), RIDE_TYPE_FLAG_ALLOW_EXTRA_TOWER_BASES = (1uLL << 29), // Only set by lift + RIDE_TYPE_FLAG_LAYERED_VEHICLE_PREVIEW = (1uLL << 30), // Only set by reverser coaster RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR = (1uLL << 31), RIDE_TYPE_FLAG_ALLOW_DOORS_ON_TRACK = (1uLL << 32), diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index 4f903e4ca9a9..886a0e47980d 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -26,7 +26,7 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = }), .InvertedTrackPaintFunctions = {}, .Flags = RIDE_TYPE_FLAGS_TRACK_HAS_3_COLOURS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION | - RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES, + RIDE_TYPE_FLAGS_COMMON_COASTER | RIDE_TYPE_FLAGS_COMMON_COASTER_NON_ALT | RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG_LAYERED_VEHICLE_PREVIEW, .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), .DefaultMode = RideMode::ContinuousCircuit, .OperatingSettings = { 0, 0, 0, 0, 0, 0 },