mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move research list import/export to separate functions

This commit is contained in:
Michael Steenbeek 2018-01-10 15:04:17 +01:00
parent 4db3323973
commit 37cec95ce2
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/rct2/S6Exporter.cpp
View File

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

1
src/openrct2/rct2/S6Exporter.h
View File

@ -54,6 +54,7 @@ private:
void ExportResearchedRideTypes();
void ExportResearchedRideEntries();
void ExportResearchedSceneryItems();
void ExportResearchList();
};
#endif

7
src/openrct2/rct2/S6Importer.cpp
View File

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