From d11862046c54d979ddb5ca2c26fef898edffdbdc Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 19 Dec 2020 21:07:41 +0100 Subject: [PATCH] Actually make Spinning control track behave as such for Steel Wild Mouse --- src/openrct2/ride/Track.cpp | 3 ++- src/openrct2/ride/Vehicle.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 15e35f70f7..41584bdc23 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -1198,7 +1198,8 @@ bool track_element_is_covered(track_type_t trackElementType) bool TrackTypeIsBooster(uint8_t rideType, track_type_t trackType) { // Boosters share their ID with the Spinning Control track. - return rideType != RIDE_TYPE_SPINNING_WILD_MOUSE && trackType == TrackElemType::Booster; + return rideType != RIDE_TYPE_SPINNING_WILD_MOUSE && rideType != RIDE_TYPE_STEEL_WILD_MOUSE + && trackType == TrackElemType::Booster; } bool TrackTypeHasSpeedSetting(track_type_t trackType) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 989d817869..db4e65b18d 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -8108,7 +8108,8 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur if (curRide != nullptr) { uint16_t rideType = curRide->type; - if (trackType == TrackElemType::RotationControlToggle && rideType == RIDE_TYPE_SPINNING_WILD_MOUSE) + if (trackType == TrackElemType::RotationControlToggle + && (rideType == RIDE_TYPE_SPINNING_WILD_MOUSE || rideType == RIDE_TYPE_STEEL_WILD_MOUSE)) { update_flags ^= VEHICLE_UPDATE_FLAG_ROTATION_OFF_WILD_MOUSE; }