mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Only animate land edge doors if track is below surface height

Browse Source
This commit is contained in:
mix
2025-06-14 04:09:56 +01:00
parent bbe0ffcc7d
commit 6c011c2a2a
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6371,6 +6371,17 @@ static void AnimateLandscapeDoor(const CoordsXYZ& doorLocation, TrackElement& tr
}
}
static const SurfaceElement* GetSurfaceElementAfterElement(const TileElement* tileElement)
{
while (tileElement->GetType() != TileElementType::Surface)
{
if (tileElement->IsLastForTile())
return nullptr;
tileElement++;
}
return tileElement->AsSurface();
}
void Vehicle::UpdateLandscapeDoors(const int32_t previousTrackHeight) const
{
const auto* currentRide = GetRide();
@@ -6384,11 +6395,20 @@ void Vehicle::UpdateLandscapeDoors(const int32_t previousTrackHeight) const
auto* const currentTrackElement = MapGetTrackElementAtBeforeSurfaceFromRide(TrackLocation, ride);
if (previousTrackElement != nullptr && currentTrackElement == nullptr)
{
AnimateLandscapeDoor<false>(previousTrackLocation, *previousTrackElement->AsTrack(), next_vehicle_on_train.IsNull());
const auto* const surfaceElement = GetSurfaceElementAfterElement(previousTrackElement);
if (surfaceElement != nullptr && surfaceElement->GetBaseZ() > previousTrackLocation.z)
{
AnimateLandscapeDoor<false>(
previousTrackLocation, *previousTrackElement->AsTrack(), next_vehicle_on_train.IsNull());
}
}
else if (previousTrackElement == nullptr && currentTrackElement != nullptr)
{
AnimateLandscapeDoor<true>(TrackLocation, *currentTrackElement->AsTrack(), next_vehicle_on_train.IsNull());
const auto* const surfaceElement = GetSurfaceElementAfterElement(currentTrackElement);
if (surfaceElement != nullptr && surfaceElement->GetBaseZ() > TrackLocation.z)
{
AnimateLandscapeDoor<true>(TrackLocation, *currentTrackElement->AsTrack(), next_vehicle_on_train.IsNull());
}
}
}