From 9226448eb16519985ec24d6ee5cd5aa4e9d9a40e Mon Sep 17 00:00:00 2001
From: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>
Date: Thu, 8 Dec 2022 19:49:54 +0100
Subject: [PATCH] Fix #18552: Trains clipping through helixes

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

diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index de09e19853..2bad25981d 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -46,6 +46,7 @@
 - Fix: [#18453] Slow walking guests don't get across level crossings in time.
 - Fix: [#18469] Land rights window buttons incorrectly disabled and markers remain visible indefinitely.
 - Fix: [#18459] ‘Highlight path issues’ hides fences for paths with additions.
+- Fix: [#18552] Trains clipping through helixes.
 - Fix: [#18606] JSON objects do not take priority over the DAT files they supersede.
 - Fix: [#18620] [Plugin] Crash when reading widget properties from windows that have both static and tab widgets.
 - Fix: [#18653] Negative ratings multipliers do not appear in Vehicle tab.
diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index 4ef1113691..614b11c7e7 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -975,12 +975,12 @@ constexpr CoordsXY defaultRightHelixUpSmallQuarterBoundLengths[4][3][2] = {
 
 constexpr CoordsXYZ defaultRightHelixUpSmallQuarterBoundOffsets[4][3][2] = {
     {
-        { { 0, 6, 8 }, { 0, 0, 0 } },
+        { { 0, 6, 0 }, { 0, 0, 0 } },
         { { 16, 16, 0 }, { 0, 0, 0 } },
-        { { 6, 0, 8 }, { 0, 0, 0 } },
+        { { 6, 0, 0 }, { 0, 0, 0 } },
     },
     {
-        { { 6, 0, 8 }, { 0, 0, 0 } },
+        { { 6, 0, 0 }, { 0, 0, 0 } },
         { { 16, 0, 0 }, { 0, 0, 0 } },
         { { 0, 6, 0 }, { 0, 27, 0 } },
     },
@@ -990,7 +990,7 @@ constexpr CoordsXYZ defaultRightHelixUpSmallQuarterBoundOffsets[4][3][2] = {
         { { 0, 0, 0 }, { 27, 0, 0 } },
     },
     {
-        { { 6, 0, 8 }, { 27, 0, 0 } },
+        { { 6, 0, 0 }, { 27, 0, 0 } },
         { { 0, 16, 0 }, { 0, 0, 0 } },
         { { 0, 6, 0 }, { 0, 0, 0 } },
     },
@@ -1040,14 +1040,14 @@ void track_paint_util_right_helix_up_small_quarter_tiles_paint(
 
 constexpr CoordsXYZ defaultRightHelixUpLargeQuarterBoundOffsets[4][5][2] = {
     {
-        { { 0, 6, 8 }, { 0, 0, 0 } },
+        { { 0, 6, 0 }, { 0, 0, 0 } },
         { { 0, 16, 0 }, { 0, 0, 0 } },
         { { 0, 0, 0 }, { 0, 0, 0 } },
         { { 16, 0, 0 }, { 0, 0, 0 } },
-        { { 6, 0, 8 }, { 0, 0, 0 } },
+        { { 6, 0, 0 }, { 0, 0, 0 } },
     },
     {
-        { { 6, 0, 8 }, { 0, 0, 0 } },
+        { { 6, 0, 0 }, { 0, 0, 0 } },
         { { 16, 0, 0 }, { 0, 0, 0 } },
         { { 0, 16, 0 }, { 0, 0, 0 } },
         { { 0, 0, 0 }, { 0, 0, 0 } },
@@ -1061,7 +1061,7 @@ constexpr CoordsXYZ defaultRightHelixUpLargeQuarterBoundOffsets[4][5][2] = {
         { { 0, 0, 0 }, { 27, 0, 0 } },
     },
     {
-        { { 6, 0, 8 }, { 27, 0, 0 } },
+        { { 6, 0, 0 }, { 27, 0, 0 } },
         { { 0, 0, 0 }, { 0, 0, 0 } },
         { { 16, 0, 0 }, { 0, 0, 0 } },
         { { 0, 16, 0 }, { 0, 0, 0 } },