From 780eb4f287673bb47febe76d482b8e5505b994bc Mon Sep 17 00:00:00 2001
From: frutiemax <lucas.malo.belanger@gmail.com>
Date: Sun, 22 Aug 2021 10:11:52 -0400
Subject: [PATCH] Part of #13874: Replace piece lengths

---
 src/openrct2/ride/Ride.cpp      | 3 ++-
 src/openrct2/ride/TrackData.cpp | 2 +-
 src/openrct2/ride/TrackData.h   | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 3bbf94cb01..75522a46d4 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -4909,7 +4909,8 @@ static int32_t ride_get_track_length(Ride* ride)
     while (track_circuit_iterator_next(&it))
     {
         trackType = it.current.element->AsTrack()->GetTrackType();
-        result += TrackPieceLengths[trackType];
+        const auto& teDescriptor = GetTrackElementDescriptor(trackType);
+        result += teDescriptor.PieceLength;
 
         moveSlowIt = !moveSlowIt;
         if (moveSlowIt)
diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp
index af506c423b..061f4077d2 100644
--- a/src/openrct2/ride/TrackData.cpp
+++ b/src/openrct2/ride/TrackData.cpp
@@ -2816,7 +2816,7 @@ const rct_preview_track *TrackBlocks[TrackElemType::Count] = {
     TrackBlocksFlatTrack3x3,
 };
 
-const uint8_t TrackPieceLengths[TrackElemType::Count] = {
+const static uint8_t TrackPieceLengths[TrackElemType::Count] = {
     32,     // TrackElemType::Flat
     32,     // TrackElemType::EndStation
     32,     // TrackElemType::BeginStation
diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h
index 2a6dcf5bb7..e507487fa5 100644
--- a/src/openrct2/ride/TrackData.h
+++ b/src/openrct2/ride/TrackData.h
@@ -21,8 +21,6 @@ extern const uint8_t TrackSequenceProperties[TrackElemType::Count][MaxSequencesP
 
 extern const rct_preview_track* TrackBlocks[TrackElemType::Count];
 
-extern const uint8_t TrackPieceLengths[TrackElemType::Count];
-
 struct track_curve_chain
 {
     int32_t next;