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

Fix #10372, #10509, #10806. Lift base sections did not export correctly

Browse Source 
Mistake made whilst refactoring that assumed that station indexes are set on only station pieces.
This commit is contained in:
duncanspumpkin
2020-04-11 08:16:53 +01:00
parent fdf98060cf
commit d4998a0ade
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/rct12/RCT12.cpp
View File

@@ -221,7 +221,8 @@ uint8_t RCT12TrackElement::GetColourScheme() const
uint8_t RCT12TrackElement::GetStationIndex() const
{
if (trackType == TRACK_ELEM_END_STATION || trackType == TRACK_ELEM_BEGIN_STATION || trackType == TRACK_ELEM_MIDDLE_STATION)
if (trackType == TRACK_ELEM_END_STATION || trackType == TRACK_ELEM_BEGIN_STATION || trackType == TRACK_ELEM_MIDDLE_STATION
|| trackType == TRACK_ELEM_TOWER_BASE)
{
return (sequence & RCT12_TRACK_ELEMENT_SEQUENCE_STATION_INDEX_MASK) >> 4;
}
@@ -790,7 +791,8 @@ void RCT12TrackElement::SetSequenceIndex(uint8_t newSequenceIndex)
void RCT12TrackElement::SetStationIndex(uint8_t newStationIndex)
{
if (trackType == TRACK_ELEM_END_STATION || trackType == TRACK_ELEM_BEGIN_STATION || trackType == TRACK_ELEM_MIDDLE_STATION)
if (trackType == TRACK_ELEM_END_STATION || trackType == TRACK_ELEM_BEGIN_STATION || trackType == TRACK_ELEM_MIDDLE_STATION
|| trackType == TRACK_ELEM_TOWER_BASE)
{
sequence &= ~RCT12_TRACK_ELEMENT_SEQUENCE_STATION_INDEX_MASK;
sequence |= (newStationIndex << 4);