mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Remove ride type checks for log bumps/rapids string

Browse Source
This commit is contained in:
Michael Steenbeek
2022-08-10 23:43:00 +02:00
committed by GitHub
parent 59c31e8b7a
commit 93807ec5bf
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1433,10 +1433,10 @@ public:
StringId stringId = STR_RIDE_CONSTRUCTION_SPECIAL;
if (_currentTrackCurve & RideConstructionSpecialPieceSelected)
{
const auto& rtd = currentRide->GetRideTypeDescriptor();
const auto& ted = GetTrackElementDescriptor(_currentTrackCurve & ~RideConstructionSpecialPieceSelected);
stringId = ted.Description;
if (stringId == STR_RAPIDS
&& (currentRide->type == RIDE_TYPE_MONSTER_TRUCKS || currentRide->type == RIDE_TYPE_CAR_RIDE))
if (stringId == STR_RAPIDS && rtd.Category != RIDE_CATEGORY_WATER)
{
stringId = STR_LOG_BUMPS;
}
@@ -2497,9 +2497,12 @@ private:
if (trackPieceStringId == STR_RAPIDS)
{
auto currentRide = get_ride(_currentRideIndex);
if (currentRide != nullptr
&& (currentRide->type == RIDE_TYPE_MONSTER_TRUCKS || currentRide->type == RIDE_TYPE_CAR_RIDE))
trackPieceStringId = STR_LOG_BUMPS;
if (currentRide != nullptr)
{
const auto& rtd = currentRide->GetRideTypeDescriptor();
if (rtd.Category != RIDE_CATEGORY_WATER)
trackPieceStringId = STR_LOG_BUMPS;
}
}
gDropdownItems[i].Format = trackPieceStringId;
if ((trackPiece | RideConstructionSpecialPieceSelected) == _currentTrackCurve)