From 52ad6861af358d5f0114900298b06a3fbc91951f Mon Sep 17 00:00:00 2001
From: Harry-Hopkinson <harryjhopkinson@gmail.com>
Date: Sun, 28 Apr 2024 14:33:41 +0000
Subject: [PATCH] Rename track_map_1x4 to kTrackMap1x4

---
 src/openrct2/ride/TrackPaint.cpp                  | 7 -------
 src/openrct2/ride/TrackPaint.h                    | 7 ++++++-
 src/openrct2/ride/gentle/FerrisWheel.cpp          | 2 +-
 src/openrct2/ride/thrill/MagicCarpet.cpp          | 2 +-
 src/openrct2/ride/thrill/SwingingInverterShip.cpp | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index e3dfb7e81a..c35ef3d0df 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -64,13 +64,6 @@ const MetalSupportPlace DiagSupportPlacement[] = {
     MetalSupportPlace::BottomCorner,
 };
 
-const uint8_t track_map_1x4[][4] = {
-    { 0, 1, 2, 3 },
-    { 2, 3, 0, 1 },
-    { 2, 3, 0, 1 },
-    { 0, 1, 2, 3 },
-};
-
 const uint32_t floorSpritesCork[] = {
     SPR_FLOOR_CORK_SE_SW,
     SPR_FLOOR_CORK_SW,
diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h
index 76093969f4..f4b237c73e 100644
--- a/src/openrct2/ride/TrackPaint.h
+++ b/src/openrct2/ride/TrackPaint.h
@@ -77,7 +77,12 @@ constexpr uint8_t kEdges4x4[] = {
 };
 // clang-format on
 
-extern const uint8_t track_map_1x4[][4];
+constexpr uint8_t kTrackMap1x4[][4] = {
+    { 0, 1, 2, 3 },
+    { 2, 3, 0, 1 },
+    { 2, 3, 0, 1 },
+    { 0, 1, 2, 3 },
+};
 
 extern const int32_t DiagBlockedSegments[];
 extern const MetalSupportPlace DiagSupportPlacement[];
diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp
index 394276eeba..1a72edc5e5 100644
--- a/src/openrct2/ride/gentle/FerrisWheel.cpp
+++ b/src/openrct2/ride/gentle/FerrisWheel.cpp
@@ -104,7 +104,7 @@ static void PaintFerrisWheel(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
     const TrackElement& trackElement)
 {
-    uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
+    uint8_t relativeTrackSequence = kTrackMap1x4[direction][trackSequence];
 
     int32_t edges;
     if (direction & 1)
diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp
index d0ad5b2150..1d0a5aad99 100644
--- a/src/openrct2/ride/thrill/MagicCarpet.cpp
+++ b/src/openrct2/ride/thrill/MagicCarpet.cpp
@@ -213,7 +213,7 @@ static void PaintMagicCarpet(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
     const TrackElement& trackElement)
 {
-    uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
+    uint8_t relativeTrackSequence = kTrackMap1x4[direction][trackSequence];
 
     // The end tiles do not have a platform
     switch (relativeTrackSequence)
diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp
index 4c497b8ab8..d69711b76f 100644
--- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp
+++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp
@@ -127,7 +127,7 @@ static void PaintSwingingInverterShip(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
     const TrackElement& trackElement)
 {
-    uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
+    uint8_t relativeTrackSequence = kTrackMap1x4[direction][trackSequence];
     ImageId imageId;
 
     const StationObject* stationObject = ride.GetStationObject();