diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 40c36d6797..2114c8658b 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -325,7 +325,7 @@ void S6Exporter::Export() _s6.last_entrance_style = gLastEntranceStyle; // rct1_water_colour // pad_01358842 - memcpy(_s6.research_items, gResearchItems, sizeof(_s6.research_items)); + ExportResearchList(); _s6.map_base_z = gMapBaseZ; memcpy(_s6.scenario_name, gScenarioName, sizeof(_s6.scenario_name)); memcpy(_s6.scenario_description, gScenarioDetails, sizeof(_s6.scenario_description)); @@ -698,6 +698,11 @@ void S6Exporter::ExportResearchedSceneryItems() } } +void S6Exporter::ExportResearchList() +{ + memcpy(_s6.research_items, gResearchItems, sizeof(_s6.research_items)); +} + extern "C" { enum { diff --git a/src/openrct2/rct2/S6Exporter.h b/src/openrct2/rct2/S6Exporter.h index 6bfb6105f0..4262de8a57 100644 --- a/src/openrct2/rct2/S6Exporter.h +++ b/src/openrct2/rct2/S6Exporter.h @@ -54,6 +54,7 @@ private: void ExportResearchedRideTypes(); void ExportResearchedRideEntries(); void ExportResearchedSceneryItems(); + void ExportResearchList(); }; #endif diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 39b606fb9e..dee7b4f78c 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -345,7 +345,7 @@ public: gLastEntranceStyle = _s6.last_entrance_style; // rct1_water_colour // pad_01358842 - memcpy(gResearchItems, _s6.research_items, sizeof(_s6.research_items)); + ImportResearchList(); gMapBaseZ = _s6.map_base_z; memcpy(gScenarioName, _s6.scenario_name, sizeof(_s6.scenario_name)); memcpy(gScenarioDetails, _s6.scenario_description, sizeof(_s6.scenario_description)); @@ -744,6 +744,11 @@ public: } } + void ImportResearchList() + { + memcpy(gResearchItems, _s6.research_items, sizeof(_s6.research_items)); + } + void Initialise() { game_init_all(_s6.map_size);