From 386bebe7003795757c83dca7682a749855ec94d7 Mon Sep 17 00:00:00 2001 From: mix <167040362+mixiate@users.noreply.github.com> Date: Thu, 24 Jul 2025 10:52:03 +0100 Subject: [PATCH] Fix River Rapids flat to gentle track piece tunnels (#24825) --- distribution/changelog.txt | 1 + src/openrct2/paint/track/water/RiverRapids.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2245255a2c..2d678e5973 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -9,6 +9,7 @@ - Fix: [#24773] The new ride window debug authors does not show the correct authors for non legacy ride objects. - Fix: [#24775] The scenery and new ride windows do not filter by file name or identifier correctly for non legacy objects. - Fix: [#24824] The Air Powered Vertical Coaster top section track piece has vertical tunnels (original bug). +- Fix: [#24825] The River Rapids flat-to-gentle track piece tunnels are incorrect on the gentle side. 0.4.24 (2025-07-05) ------------------------------------------------------------------------ diff --git a/src/openrct2/paint/track/water/RiverRapids.cpp b/src/openrct2/paint/track/water/RiverRapids.cpp index 45784aa4bb..03d048f9ff 100644 --- a/src/openrct2/paint/track/water/RiverRapids.cpp +++ b/src/openrct2/paint/track/water/RiverRapids.cpp @@ -348,7 +348,8 @@ static void PaintRiverRapidsTrack25DegToFlatB( DrawSupportForSequenceA( session, supportType.wooden, 0, direction, height, session.SupportColours); - PaintUtilPushTunnelRotated(session, direction, height, kTunnelGroup, TunnelSubType::Flat); + const auto tunnelType = direction == 0 || direction == 3 ? TunnelSubType::Flat : TunnelSubType::SlopeEnd; + PaintUtilPushTunnelRotated(session, direction, height, kTunnelGroup, tunnelType); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48);