From 559a4c0953f9809cf98f108587d5bcd96ee07ce8 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Thu, 12 Oct 2017 06:40:57 -0400 Subject: [PATCH] Fix #6445: set favourite ride to N/A when importing from RCT1/AA --- src/openrct2/rct1/S4Importer.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 04291537a1..6ad0717830 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -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;