mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Part of #13874: Replace piece lengths

This commit is contained in:
frutiemax 2021-08-22 10:11:52 -04:00
parent 716dd3dcb6
commit 780eb4f287
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/ride/Ride.cpp
View File

@ -4909,7 +4909,8 @@ static int32_t ride_get_track_length(Ride* ride)
while (track_circuit_iterator_next(&it)) while (track_circuit_iterator_next(&it))
{ {
trackType = it.current.element->AsTrack()->GetTrackType(); trackType = it.current.element->AsTrack()->GetTrackType();
result += TrackPieceLengths[trackType]; const auto& teDescriptor = GetTrackElementDescriptor(trackType);
result += teDescriptor.PieceLength;
moveSlowIt = !moveSlowIt; moveSlowIt = !moveSlowIt;
if (moveSlowIt) if (moveSlowIt)

2
src/openrct2/ride/TrackData.cpp
View File

@ -2816,7 +2816,7 @@ const rct_preview_track *TrackBlocks[TrackElemType::Count] = {
TrackBlocksFlatTrack3x3, TrackBlocksFlatTrack3x3,
}; };
const uint8_t TrackPieceLengths[TrackElemType::Count] = { const static uint8_t TrackPieceLengths[TrackElemType::Count] = {
32, // TrackElemType::Flat 32, // TrackElemType::Flat
32, // TrackElemType::EndStation 32, // TrackElemType::EndStation
32, // TrackElemType::BeginStation 32, // TrackElemType::BeginStation

2
src/openrct2/ride/TrackData.h
View File

@ -21,8 +21,6 @@ extern const uint8_t TrackSequenceProperties[TrackElemType::Count][MaxSequencesP
extern const rct_preview_track* TrackBlocks[TrackElemType::Count]; extern const rct_preview_track* TrackBlocks[TrackElemType::Count];
extern const uint8_t TrackPieceLengths[TrackElemType::Count];
struct track_curve_chain struct track_curve_chain
{ {
int32_t next; int32_t next;