mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

Actually make Spinning control track behave as such for Steel Wild Mouse

Browse Source
This commit is contained in:
Gymnasiast
2020-12-19 21:07:41 +01:00
committed by Richard Qian
parent bcf0e15c97
commit d11862046c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/ride/Track.cpp
View File

@@ -1198,7 +1198,8 @@ bool track_element_is_covered(track_type_t trackElementType)
bool TrackTypeIsBooster(uint8_t rideType, track_type_t trackType) bool TrackTypeIsBooster(uint8_t rideType, track_type_t trackType)
{ {
// Boosters share their ID with the Spinning Control track. // 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) bool TrackTypeHasSpeedSetting(track_type_t trackType)

3
src/openrct2/ride/Vehicle.cpp
View File

@@ -8108,7 +8108,8 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur
if (curRide != nullptr) if (curRide != nullptr)
{ {
uint16_t rideType = curRide->type; 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; update_flags ^= VEHICLE_UPDATE_FLAG_ROTATION_OFF_WILD_MOUSE;
} }