Fix OpenRCT2#12353: Research window shows wrong ride type

Gymnasiast · web-flow · commit f567da04ebbe · 2020-07-22T23:21:08.000+02:00
diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h
@@ -105,7 +105,7 @@ struct ResearchItem
         {
             entryIndex = RCTEntryIndexToOpenRCT2EntryIndex(oldResearchItem.entryIndex);
             auto* rideEntry = get_ride_entry(entryIndex);
-            baseRideType = rideEntry != nullptr ? RCT2RideTypeToOpenRCT2RideType(oldResearchItem.type, rideEntry)
+            baseRideType = rideEntry != nullptr ? RCT2RideTypeToOpenRCT2RideType(oldResearchItem.baseRideType, rideEntry)
                                                 : oldResearchItem.baseRideType;
             type = Research::EntryType{ oldResearchItem.type };
             flags = oldResearchItem.flags;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ struct ResearchItem`
`105`	`105`	`{`
`106`	`106`	`entryIndex = RCTEntryIndexToOpenRCT2EntryIndex(oldResearchItem.entryIndex);`
`107`	`107`	`auto* rideEntry = get_ride_entry(entryIndex);`
`108`		`- baseRideType = rideEntry != nullptr ? RCT2RideTypeToOpenRCT2RideType(oldResearchItem.type, rideEntry)`
	`108`	`+ baseRideType = rideEntry != nullptr ? RCT2RideTypeToOpenRCT2RideType(oldResearchItem.baseRideType, rideEntry)`
`109`	`109`	`: oldResearchItem.baseRideType;`
`110`	`110`	`type = Research::EntryType{ oldResearchItem.type };`
`111`	`111`	`flags = oldResearchItem.flags;`