From 48e53cdd23a078ba636ae5283c086e92199cc7f7 Mon Sep 17 00:00:00 2001
From: Harry-Hopkinson <harryjhopkinson@gmail.com>
Date: Thu, 9 May 2024 14:21:22 +0000
Subject: [PATCH] Rename defaultRightQuarterTurn5TilesOffsets

---
 src/openrct2/ride/TrackPaint.cpp              | 31 -------------------
 src/openrct2/ride/TrackPaint.h                | 31 ++++++++++++++++++-
 .../ride/coaster/JuniorRollerCoaster.cpp      |  4 +--
 src/openrct2/ride/transport/Monorail.cpp      |  2 +-
 4 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index 552614699a..eb54290031 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -1187,37 +1187,6 @@ void TrackPaintUtilDiagTilesPaint(
         { { boundsOffset.x, boundsOffset.y, height + boundsOffset.z }, { boundsLength, thickness } });
 }
 
-constexpr CoordsXY defaultRightQuarterTurn5TilesOffsets[4][5] = {
-    {
-        { 0, 6 },
-        { 0, 16 },
-        { 0, 0 },
-        { 16, 0 },
-        { 6, 0 },
-    },
-    {
-        { 6, 0 },
-        { 16, 0 },
-        { 0, 16 },
-        { 0, 0 },
-        { 0, 6 },
-    },
-    {
-        { 0, 6 },
-        { 0, 0 },
-        { 16, 16 },
-        { 0, 0 },
-        { 6, 0 },
-    },
-    {
-        { 6, 0 },
-        { 0, 0 },
-        { 16, 0 },
-        { 0, 16 },
-        { 0, 6 },
-    },
-};
-
 constexpr CoordsXYZ defaultRightQuarterTurn5TilesBoundOffsets[4][5] = {
     {
         { 0, 6, 0 },
diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h
index b0d77942e4..e71c351ab3 100644
--- a/src/openrct2/ride/TrackPaint.h
+++ b/src/openrct2/ride/TrackPaint.h
@@ -372,7 +372,36 @@ constexpr uint8_t kMapReversedDiagonalStraight[4] = {
     0,
 };
 
-extern const CoordsXY defaultRightQuarterTurn5TilesOffsets[4][5];
+constexpr CoordsXY kDefaultRightQuarterTurn5TilesOffsets[4][5] = {
+    {
+        { 0, 6 },
+        { 0, 16 },
+        { 0, 0 },
+        { 16, 0 },
+        { 6, 0 },
+    },
+    {
+        { 6, 0 },
+        { 16, 0 },
+        { 0, 16 },
+        { 0, 0 },
+        { 0, 6 },
+    },
+    {
+        { 0, 6 },
+        { 0, 0 },
+        { 16, 16 },
+        { 0, 0 },
+        { 6, 0 },
+    },
+    {
+        { 6, 0 },
+        { 0, 0 },
+        { 16, 0 },
+        { 0, 16 },
+        { 0, 6 },
+    },
+};
 extern const CoordsXYZ defaultRightQuarterTurn5TilesBoundOffsets[4][5];
 extern const CoordsXY defaultRightQuarterTurn5TilesBoundLengths[4][5];
 
diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
index cbb7eca28c..19d847bc6a 100644
--- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
@@ -2054,7 +2054,7 @@ static void JuniorRCRightQuarterTurn5TilesPaintSetup(
 {
     TrackPaintUtilRightQuarterTurn5TilesPaint(
         session, 1, height, direction, trackSequence, session.TrackColours, junior_rc_track_pieces_flat_quarter_turn_5_tiles,
-        defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths,
+        kDefaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths,
         defaultRightQuarterTurn5TilesBoundOffsets);
 
     int32_t supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence];
@@ -2932,7 +2932,7 @@ static void JuniorRCPaintTrackRightQuarterTurn5Tiles25DegUp(
     auto subTypeOffset = JuniorRCGetSubTypeOffset<JuniorRCSubType::Junior>(trackElement);
     TrackPaintUtilRightQuarterTurn5TilesPaint(
         session, 1, height, direction, trackSequence, session.TrackColours,
-        junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[subTypeOffset], defaultRightQuarterTurn5TilesOffsets,
+        junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[subTypeOffset], kDefaultRightQuarterTurn5TilesOffsets,
         defaultRightQuarterTurn5TilesBoundLengths, nullptr);
 
     static constexpr uint8_t supportSpecial[4] = { 11, 8, 8, 7 };
diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp
index 687da6b40b..d7928aacf8 100644
--- a/src/openrct2/ride/transport/Monorail.cpp
+++ b/src/openrct2/ride/transport/Monorail.cpp
@@ -644,7 +644,7 @@ static void PaintMonorailTrackRightQuarterTurn5Tiles(
 {
     TrackPaintUtilRightQuarterTurn5TilesPaint(
         session, 3, height, direction, trackSequence, session.TrackColours, monorail_track_pieces_flat_quarter_turn_5_tiles,
-        defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
+        kDefaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
 
     switch (trackSequence)
     {