From 8e64eaca947ac66ce259ef20624cf3c1b567c07e Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 30 Dec 2023 20:02:08 +0100 Subject: [PATCH 1/3] Fix #18963: Razor Rocks and BPB import too few research items --- distribution/changelog.txt | 1 + src/openrct2/rct1/RCT1.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9895ed673d..e300a511c3 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.4.9 (in development) ------------------------------------------------------------------------ +- Fix: [#18963] Research table in parks from Loopy Landscapes is imported incompletely. - Fix: [#20907] RCT1/AA scenarios use the 4-across train for the Inverted Roller Coaster. - Fix: [#21332] Mini Helicopters and Monorail Cycles ride types are swapped in research within RCT1 scenarios. - Fix: [#21347] Too many options are hidden if the platform has no file picker. diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 8604a4267e..8390cc9089 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -738,8 +738,8 @@ namespace RCT1 uint8_t Unk199C96[3]; uint8_t WaterColour; uint16_t Unk199C9A; - ResearchItem ResearchItemsLL[180]; - uint8_t Unk19A020[5468]; + ResearchItem ResearchItemsLL[250]; + uint8_t Unk19A0D9[5118]; RCT12Banner Banners[Limits::MaxBanners]; char StringTable[Limits::MaxUserStrings][Limits::MaxUserStringLength]; uint32_t GameTimeCounter; From c40a840f5bf355e9f8e5405a58d79b8482dd4544 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 8 Feb 2024 02:07:31 +0100 Subject: [PATCH 2/3] Fix #18963: Too many items available in some RCT1 scenarios --- src/openrct2/rct1/S4Importer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 95888fa274..83041f9fef 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -451,8 +451,7 @@ namespace RCT1 break; case RCT1_RESEARCH_TYPE_VEHICLE: // For some bizarre reason, RCT1 research lists contain vehicles that aren't actually researched. - // Extra bizarrely, this does not seem to apply to Loopy Landscapes saves/scenarios. - if (rideTypeInResearch[researchItem->RelatedRide] || _gameVersion == FILE_VERSION_RCT1_LL) + if (rideTypeInResearch[researchItem->RelatedRide]) { AddEntryForVehicleType(static_cast(researchItem->RelatedRide), researchItem->Item); } From 8a5e7d32f62e747f9294e7355d2731f7a12ff085 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 8 Feb 2024 22:04:46 +0100 Subject: [PATCH 3/3] Update changelog [ci skip] --- distribution/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e300a511c3..2388634dd2 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,6 +1,6 @@ 0.4.9 (in development) ------------------------------------------------------------------------ -- Fix: [#18963] Research table in parks from Loopy Landscapes is imported incompletely. +- Fix: [#18963] Research table in parks from Loopy Landscapes is imported incorrectly. - Fix: [#20907] RCT1/AA scenarios use the 4-across train for the Inverted Roller Coaster. - Fix: [#21332] Mini Helicopters and Monorail Cycles ride types are swapped in research within RCT1 scenarios. - Fix: [#21347] Too many options are hidden if the platform has no file picker.