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

Fix RCT1 shop import (#14157)

Browse Source 
Regression from https://github.com/OpenRCT2/OpenRCT2/pull/14021
This commit is contained in:
Michael Steenbeek
2021-02-23 23:13:26 +01:00
committed by GitHub
parent 18e86907db
commit aa11a1ee96
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/rct1/S4Importer.cpp
View File

@@ -2119,7 +2119,8 @@ private:
{
auto dst2 = dst->AsTrack();
auto src2 = src->AsTrack();
auto rideType = _s4.rides[src2->GetRideIndex()].type;
const auto* ride = get_ride(src2->GetRideIndex());
auto rideType = (ride != nullptr) ? ride->type : RIDE_TYPE_NULL;
dst2->SetTrackType(RCT1TrackTypeToOpenRCT2(src2->GetTrackType(), rideType));
dst2->SetSequenceIndex(src2->GetSequenceIndex());
@@ -2131,7 +2132,7 @@ private:
dst2->SetStationIndex(src2->GetStationIndex());
dst2->SetHasGreenLight(src2->HasGreenLight());
dst2->SetIsIndestructible(src2->IsIndestructible());
if (rideType == RCT1_RIDE_TYPE_GHOST_TRAIN)
if (rideType == RIDE_TYPE_GHOST_TRAIN)
{
dst2->SetDoorAState(src2->GetDoorAState());
dst2->SetDoorBState(src2->GetDoorBState());