mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #21130 from Gymnasiast/fix/research-table-size

Browse source 
Fix: Research table in LL parks imported incompletely
This commit is contained in:
Michael Steenbeek 2024-02-08 22:05:09 +01:00 committed by GitHub
commit 776674af7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/changelog.txt
View file

@ -1,5 +1,6 @@
0.4.9 (in development)
------------------------------------------------------------------------
- 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.

4
src/openrct2/rct1/RCT1.h
View file

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

3
src/openrct2/rct1/S4Importer.cpp
View file

@ -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<RideType>(researchItem->RelatedRide), researchItem->Item);
}