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

Fix #6445: set favourite ride to N/A when importing from RCT1/AA

Browse Source
This commit is contained in:
Robert Jordan
2017-10-12 06:40:57 -04:00
committed by Michael Steenbeek
parent a27adb5df0
commit 559a4c0953
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1473,8 +1473,18 @@ private:
dst->pathfind_goal.z = 0xFF;
dst->pathfind_goal.direction = 0xFF;
dst->favourite_ride = src->favourite_ride;
dst->favourite_ride_rating = src->favourite_ride_rating;
// Guests' favourite ride was only saved in LL.
// Set it to N/A if the save comes from the original or AA.
if (_gameVersion == FILE_VERSION_RCT1_LL)
{
dst->favourite_ride = src->favourite_ride;
dst->favourite_ride_rating = src->favourite_ride_rating;
}
else
{
dst->favourite_ride = RIDE_INDEX_NULL;
dst->favourite_ride_rating = 0;
}
dst->item_standard_flags = src->item_standard_flags;