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

Replace load_from_sv4() and load_from_sc4()

This commit is contained in:
Gymnasiast 2022-10-08 19:29:37 +02:00
parent 830fedb6b8
commit a3800320bc
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/Editor.cpp
View File

@ -248,7 +248,7 @@ namespace Editor
*/
static bool LoadLandscapeFromSV4(const char* path)
{
load_from_sv4(path);
GetContext()->LoadParkFromFile(path);
ClearMapForEditing(true);
gEditorStep = EditorStep::LandscapeEditor;
@ -262,7 +262,7 @@ namespace Editor
static bool LoadLandscapeFromSC4(const char* path)
{
load_from_sc4(path);
GetContext()->LoadParkFromFile(path);
ClearMapForEditing(false);
gEditorStep = EditorStep::LandscapeEditor;

3
src/openrct2/rct1/RCT1.h
View File

@ -1279,6 +1279,3 @@ namespace RCT1
track_type_t RCT1TrackTypeToOpenRCT2(RCT12TrackType origTrackType, ride_type_t rideType);
} // namespace RCT1
void load_from_sv4(const char* path);
void load_from_sc4(const char* path);

18
src/openrct2/rct1/S4Importer.cpp
View File

@ -3082,21 +3082,3 @@ std::unique_ptr<IParkImporter> ParkImporter::CreateS4()
{
return std::make_unique<RCT1::S4Importer>();
}
void load_from_sv4(const utf8* path)
{
auto& objectMgr = GetContext()->GetObjectManager();
auto s4Importer = std::make_unique<RCT1::S4Importer>();
auto result = s4Importer->LoadSavedGame(path);
objectMgr.LoadObjects(result.RequiredObjects);
s4Importer->Import();
}
void load_from_sc4(const utf8* path)
{
auto& objectMgr = GetContext()->GetObjectManager();
auto s4Importer = std::make_unique<RCT1::S4Importer>();
auto result = s4Importer->LoadScenario(path);
objectMgr.LoadObjects(result.RequiredObjects);
s4Importer->Import();
}