mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Refactor track element to use 16 bytes

Browse Source
This commit is contained in:
Gymnasiast
2019-08-31 13:14:19 +02:00
parent abdf6e695a
commit bb73dd0dfb
12 changed files with 243 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/ride/TrackDesign.cpp
View File

@@ -225,7 +225,7 @@ rct_string_id TrackDesign::CreateTrackDesignTrack(const Ride& ride)
if (RideData4[ride.type].flags & RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE
&& trackElement.element->AsTrack()->IsInverted())
{
trackFlags |= TRACK_ELEMENT_FLAG_INVERTED;
trackFlags |= TD6_TRACK_ELEMENT_FLAG_INVERTED;
}
track.flags = trackFlags;
@@ -1504,11 +1504,11 @@ static bool track_design_place_ride(TrackDesign* td6, int16_t x, int16_t y, int1
uint32_t seatRotation = track.flags & 0x0F;
int32_t liftHillAndAlternativeState = 0;
if (track.flags & TRACK_ELEMENT_TYPE_FLAG_CHAIN_LIFT)
if (track.flags & RCT12_TRACK_ELEMENT_TYPE_FLAG_CHAIN_LIFT)
{
liftHillAndAlternativeState |= 1;
}
if (track.flags & TRACK_ELEMENT_FLAG_INVERTED)
if (track.flags & TD6_TRACK_ELEMENT_FLAG_INVERTED)
{
liftHillAndAlternativeState |= 2;
}