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

Check station flags instead of hardcoded legacy IDs

Browse Source 
PR #20483 introduced a check for covered stations, but incorrectly checked the RCT2 IDs.
This commit replaces this check with a proper flag check, which will work for any station style, including custom ones.
This commit is contained in:
Michael Steenbeek
2024-01-06 14:46:17 +01:00
committed by GitHub
parent ba585f4474
commit adadaafdb0
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/entity/Balloon.cpp
View File

@@ -158,12 +158,8 @@ bool Balloon::Collides() const
}
else
{
// all station platforms besides the plain and invisible ones are covered
auto style = GetRide(trackElement->GetRideIndex())->GetEntranceStyle();
if (style != RCT12_STATION_STYLE_PLAIN && style != RCT12_STATION_STYLE_INVISIBLE)
{
check_ceiling = true;
}
auto* ride = GetRide(trackElement->GetRideIndex());
check_ceiling = (ride != nullptr) ? RideHasStationShelter(*ride) : false;
}
}

12
src/openrct2/ride/Ride.cpp
View File

@@ -5983,15 +5983,3 @@ ResultWithMessage Ride::ChangeStatusCreateVehicles(bool isApplying, const Coords
return { true };
}
uint8_t Ride::GetEntranceStyle() const
{
if (const auto* stationObject = GetStationObject(); stationObject != nullptr)
{
return GetStationStyleFromIdentifier(stationObject->GetIdentifier());
}
else
{
return RCT12_STATION_STYLE_PLAIN;
}
}