From c4c230b43b8358def1ed0a9d2a743e1b588b75c9 Mon Sep 17 00:00:00 2001
From: mix <167040362+mixiate@users.noreply.github.com>
Date: Sat, 15 Feb 2025 14:41:18 +0000
Subject: [PATCH] Fix spinning tunnels drawing over sloped terrain in front of
 them (#23818)

---
 distribution/changelog.txt       | 1 +
 src/openrct2/ride/TrackPaint.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 9858448fe3..10452f5818 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -9,6 +9,7 @@
 - Fix: [#23522] Diagonal sloped Steeplechase supports have glitched sprites at the base.
 - Fix: [#23795] Looping Roller Coaster vertical loop supports are drawn incorrectly.
 - Fix: [#23809] Trains glitch on Bobsleigh Coaster small helixes.
+- Fix: [#23818] Spinning tunnels can draw over sloped terrain in front of them.
 
 0.4.19.1 (2025-02-03)
 ------------------------------------------------------------------------
diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index c8ab3ecde8..96287bb482 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -1749,11 +1749,11 @@ void TrackPaintUtilSpinningTunnelPaint(PaintSession& session, int8_t thickness,
     imageId = colourFlags.WithIndex(trackSpritesGhostTrainSpinningTunnel[direction & 1][1][frame]);
     if (direction == 0 || direction == 2)
     {
-        PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 4, 28, height }, { 26, 1, 23 } });
+        PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 2, 28, height }, { 28, 1, 23 } });
     }
     else
     {
-        PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 28, 4, height }, { 1, 26, 23 } });
+        PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 28, 2, height }, { 1, 28, 23 } });
     }
 }