From a3e685bf1fd84ef0683b717e05487dbccfd8094c Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Sun, 28 Apr 2024 14:14:58 +0000 Subject: [PATCH] Rename track_map_3x3 to kTrackMap3x3 --- src/openrct2/ride/TrackPaint.cpp | 7 ------- src/openrct2/ride/TrackPaint.h | 7 ++++++- src/openrct2/ride/gentle/Circus.cpp | 2 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 2 +- src/openrct2/ride/gentle/HauntedHouse.cpp | 2 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 2 +- src/openrct2/ride/gentle/ObservationTower.cpp | 2 +- src/openrct2/ride/gentle/SpaceRings.cpp | 2 +- src/openrct2/ride/thrill/3dCinema.cpp | 2 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 2 +- src/openrct2/ride/thrill/RotoDrop.cpp | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 2 +- src/openrct2/ride/thrill/Twist.cpp | 2 +- src/openrct2/ride/transport/Lift.cpp | 2 +- 14 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 114565ecfd..990a6887aa 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -50,13 +50,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = { { -1, 0 }, }; -const uint8_t track_map_3x3[][9] = { - { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, - { 0, 3, 5, 7, 2, 8, 1, 6, 4 }, - { 0, 7, 8, 6, 5, 4, 3, 1, 2 }, - { 0, 6, 4, 1, 8, 2, 7, 3, 5 }, -}; - // clang-format off const uint8_t edges_3x3[] = { 0, diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index d185126c5b..f662049e57 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -30,7 +30,12 @@ constexpr uint8_t kEdges2x2[] = { EDGE_SW | EDGE_SE, }; -extern const uint8_t track_map_3x3[][9]; +constexpr uint8_t kTrackMap3x3[][9] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, + { 0, 3, 5, 7, 2, 8, 1, 6, 4 }, + { 0, 7, 8, 6, 5, 4, 3, 1, 2 }, + { 0, 6, 4, 1, 8, 2, 7, 3, 5 }, +}; extern const uint8_t edges_3x3[]; extern const uint8_t track_map_4x4[][16]; diff --git a/src/openrct2/ride/gentle/Circus.cpp b/src/openrct2/ride/gentle/Circus.cpp index f10145abb4..ccabd34580 100644 --- a/src/openrct2/ride/gentle/Circus.cpp +++ b/src/openrct2/ride/gentle/Circus.cpp @@ -50,7 +50,7 @@ static void PaintCircus( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index c1e18e5ced..34edd72cd2 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -84,7 +84,7 @@ static void PaintCrookedHouse( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 75de00cb64..0df068c0f4 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -64,7 +64,7 @@ static void PaintHauntedHouse( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 881d3ad259..ce72e55b9e 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -105,7 +105,7 @@ static void PaintMerryGoRound( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 3efe30f862..965879c1de 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -83,7 +83,7 @@ static void PaintObservationTowerBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; CoordsXY position = session.MapPosition; diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index e15c4822c5..6ff0258ec0 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -87,7 +87,7 @@ static void PaintSpaceRings( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; CoordsXY position = session.MapPosition; diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index ff0497831e..7a5f2f67ae 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -52,7 +52,7 @@ static void Paint3dCinema( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 57b0517f53..e2d01dd130 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -91,7 +91,7 @@ static void PaintLaunchedFreefallBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 94cff1b347..53cb14f754 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -103,7 +103,7 @@ static void PaintRotoDropBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 9764b3b417..48ebe2012c 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -182,7 +182,7 @@ static void PaintTopSpin( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; int32_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 53ab126904..4c2e051cc9 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -85,7 +85,7 @@ static void PaintTwist( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; const uint8_t edges = edges_3x3[trackSequence]; diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 2c063be35a..559e02f2c5 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -50,7 +50,7 @@ static void PaintLiftBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - trackSequence = track_map_3x3[direction][trackSequence]; + trackSequence = kTrackMap3x3[direction][trackSequence]; if (trackSequence == 0) {