mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00
Code Issues Releases Wiki Activity

Fix research import/export (#12345)

Browse Source 
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.
This commit is contained in:
Duncan
2020-07-22 09:42:16 +01:00
committed by GitHub
parent 205fc3332b
commit 2d1a6bd13b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/management/Research.h
View File

@@ -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;
}