From 716dd3dcb622a1fc438b2f56e775c6b017d940b8 Mon Sep 17 00:00:00 2001 From: frutiemax Date: Sun, 22 Aug 2021 10:09:23 -0400 Subject: [PATCH] Part of #13874: Replace mirror maps --- src/openrct2/ride/TrackData.cpp | 2 +- src/openrct2/ride/TrackData.h | 1 - src/openrct2/ride/TrackDesign.cpp | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index cce0d3f73b..af506c423b 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -4045,7 +4045,7 @@ const money32 TrackPricing[TrackElemType::Count] = { }; /** rct2: 0x0099EA1C */ -const track_type_t TrackElementMirrorMap[TrackElemType::Count] = { +const static track_type_t TrackElementMirrorMap[TrackElemType::Count] = { TrackElemType::Flat, TrackElemType::EndStation, TrackElemType::BeginStation, diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h index 60cb33e6e2..2a6dcf5bb7 100644 --- a/src/openrct2/ride/TrackData.h +++ b/src/openrct2/ride/TrackData.h @@ -62,7 +62,6 @@ constexpr const dodgems_track_size DodgemsTrackSize(track_type_t type) return { 4, 4, 59, 123 }; return { 0, 0, 0, 0 }; } -extern const track_type_t TrackElementMirrorMap[TrackElemType::Count]; extern const uint8_t TrackSequenceElementAllowedWallEdges[TrackElemType::Count][16]; diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index ef996c45ea..be6835567d 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -770,7 +770,8 @@ static void track_design_mirror_ride(TrackDesign* td6) { for (auto& track : td6->track_elements) { - track.type = TrackElementMirrorMap[track.type]; + const auto& teDescriptor = GetTrackElementDescriptor(track.type); + track.type = teDescriptor.MirrorMap; } for (auto& entrance : td6->entrance_elements)