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

Fix #10028: Saved park--brakes all set to 0mph

Browse Source
This commit is contained in:
Michael Steenbeek
2019-09-29 22:53:41 +02:00
committed by GitHub
parent ff1698bcb9
commit a63395eb1c
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2128,8 +2128,16 @@ private:
dst2->SetDoorBState(src2->GetDoorBState());
dst2->SetStationIndex(src2->GetStationIndex());
dst2->SetHasGreenLight(src2->HasGreenLight());
dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed());
dst2->SetPhotoTimeout(src2->GetPhotoTimeout());
auto trackType = dst2->GetTrackType();
if (track_element_has_speed_setting(trackType))
{
dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed());
}
else if (trackType == TRACK_ELEM_ON_RIDE_PHOTO)
{
dst2->SetPhotoTimeout(src2->GetPhotoTimeout());
}
if (_s4.rides[src2->GetRideIndex()].type == RIDE_TYPE_MAZE)
{

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

@@ -1056,8 +1056,16 @@ public:
dst2->SetInverted(src2->IsInverted());
dst2->SetStationIndex(src2->GetStationIndex());
dst2->SetHasGreenLight(src2->HasGreenLight());
dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed());
dst2->SetPhotoTimeout(src2->GetPhotoTimeout());
auto trackType = dst2->GetTrackType();
if (track_element_has_speed_setting(trackType))
{
dst2->SetBrakeBoosterSpeed(src2->GetBrakeBoosterSpeed());
}
else if (trackType == TRACK_ELEM_ON_RIDE_PHOTO)
{
dst2->SetPhotoTimeout(src2->GetPhotoTimeout());
}
// Skipping IsHighlighted()
auto rideType = _s6.rides[src2->GetRideIndex()].type;