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

Merge pull request #9981 from Gymnasiast/fix/9978

Browse Source 
Fix #9978: Mazes are imported incorrectly
This commit is contained in:
Duncan
2019-09-14 07:36:08 +01:00
committed by GitHub
parent 4424964686 0aca04256b
commit 1efc774483
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2/rct2/S6Importer.cpp
View File

@@ -1058,17 +1058,14 @@ public:
dst2->SetHasGreenLight(src2->HasGreenLight());
dst2->SetPhotoTimeout(src2->GetPhotoTimeout());
// Skipping IsHighlighted()
auto ride = get_ride(dst2->GetRideIndex());
if (ride)
auto rideType = _s6.rides[src2->GetRideIndex()].type;
if (rideType == RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER)
{
if (ride->type == RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER)
{
dst2->SetSeatRotation(src2->GetSeatRotation());
}
else if (ride->type == RIDE_TYPE_MAZE)
{
dst2->SetMazeEntry(src2->GetMazeEntry());
}
dst2->SetSeatRotation(src2->GetSeatRotation());
}
else if (rideType == RIDE_TYPE_MAZE)
{
dst2->SetMazeEntry(src2->GetMazeEntry());
}
break;