mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Code Issues Releases Wiki Activity

Part of #13874: Replace alternativeTypes

Browse Source
This commit is contained in:
frutiemax
2021-08-22 09:44:36 -04:00
parent 80418efafb
commit 5a8cc7c610
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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

3
src/openrct2/windows/_legacy.cpp
View File

@@ -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;