diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index ccb5301b03..7b867db264 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -3503,7 +3503,7 @@ const track_descriptor gTrackDescriptors[142] = { }; /** rct2: 0x00993D1C */ -const track_type_t AlternativeTrackTypes[TrackElemType::Count] = { +const static track_type_t AlternativeTrackTypes[TrackElemType::Count] = { TrackElemType::FlatCovered, // TrackElemType::Flat TrackElemType::None, TrackElemType::None, diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h index dcdaaa1c55..f7ef28b4af 100644 --- a/src/openrct2/ride/TrackData.h +++ b/src/openrct2/ride/TrackData.h @@ -44,8 +44,6 @@ struct track_descriptor extern const track_descriptor gTrackDescriptors[142]; -extern const track_type_t AlternativeTrackTypes[TrackElemType::Count]; - extern const money32 TrackPricing[TrackElemType::Count]; struct dodgems_track_size diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index 9c3691c30a..15ff0447f5 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -306,7 +306,8 @@ bool window_ride_construction_update_state( && _currentTrackAlternative & RIDE_TYPE_ALTERNATIVE_TRACK_PIECES) { auto availablePieces = rtd.CoveredTrackPieces; - auto alternativeType = AlternativeTrackTypes[trackType]; + const auto& teDescriptor = GetTrackElementDescriptor(trackType); + auto alternativeType = teDescriptor.AlternativeType; if (alternativeType != TrackElemType::None && (availablePieces & (1ULL << trackType))) { trackType = alternativeType;