From 2d1a6bd13bc6f16adaa51776a8a95b3b0321d031 Mon Sep 17 00:00:00 2001 From: Duncan Date: Wed, 22 Jul 2020 09:42:16 +0100 Subject: [PATCH] Fix research import/export (#12345) Old version incorrectly tried to convert the research type not the base ride type causing crashes when new saves were used on older versions of OpenRCT2 or vanilla. --- src/openrct2/management/Research.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index 5c9c201afc..06b0211016 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -78,8 +78,8 @@ struct ResearchItem else { retItem.entryIndex = OpenRCT2EntryIndexToRCTEntryIndex(entryIndex); - retItem.baseRideType = baseRideType; - retItem.type = OpenRCT2RideTypeToRCT2RideType(type); + retItem.baseRideType = OpenRCT2RideTypeToRCT2RideType(baseRideType); + retItem.type = type; retItem.flags = (flags & ~RESEARCH_ENTRY_FLAG_FIRST_OF_TYPE); retItem.category = category; } @@ -100,10 +100,10 @@ struct ResearchItem else { entryIndex = RCTEntryIndexToOpenRCT2EntryIndex(oldResearchItem.entryIndex); - baseRideType = oldResearchItem.baseRideType; auto* rideEntry = get_ride_entry(entryIndex); - type = rideEntry != nullptr ? RCT2RideTypeToOpenRCT2RideType(oldResearchItem.type, rideEntry) - : oldResearchItem.type; + baseRideType = rideEntry != nullptr ? RCT2RideTypeToOpenRCT2RideType(oldResearchItem.type, rideEntry) + : oldResearchItem.baseRideType; + type = oldResearchItem.type; flags = oldResearchItem.flags; category = oldResearchItem.category; }