mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix incorrect label when using Spinning Control piece on Wild Mouse

Browse Source
This commit is contained in:
Richard Qian
2020-12-14 17:27:15 -06:00
parent 6a095f39a5
commit 8e4dbcbba6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2-ui/windows/RideConstruction.cpp
View File

@@ -2249,7 +2249,8 @@ static void window_ride_construction_invalidate(rct_window* w)
{
stringId = STR_LOG_BUMPS;
}
else if (stringId == STR_SPINNING_CONTROL_TOGGLE_TRACK && ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE)
else if (stringId == STR_SPINNING_CONTROL_TOGGLE_TRACK
&& ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE && ride->type != RIDE_TYPE_STEEL_WILD_MOUSE)
{
stringId = STR_BOOSTER;
}
@@ -3063,7 +3064,7 @@ static void window_ride_construction_update_widgets(rct_window* w)
bool brakesSelected = _selectedTrackType == TrackElemType::Brakes
|| _currentTrackCurve == (RideConstructionSpecialPieceSelected | TrackElemType::Brakes);
_boosterTrackSelected = TrackTypeIsBooster(ride->type, _selectedTrackType)
|| (ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE
|| (ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE && ride->type != RIDE_TYPE_STEEL_WILD_MOUSE
&& _currentTrackCurve == (RideConstructionSpecialPieceSelected | TrackElemType::Booster));
if (!brakesSelected && !_boosterTrackSelected)
@@ -3354,7 +3355,7 @@ static void window_ride_construction_show_special_track_dropdown(rct_window* w,
if (trackPieceStringId == STR_SPINNING_CONTROL_TOGGLE_TRACK)
{
auto ride = get_ride(_currentRideIndex);
if (ride != nullptr && ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE)
if (ride != nullptr && ride->type != RIDE_TYPE_SPINNING_WILD_MOUSE && ride->type != RIDE_TYPE_STEEL_WILD_MOUSE)
trackPieceStringId = STR_BOOSTER;
}
gDropdownItemsFormat[i] = trackPieceStringId;