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

Fix loading title sequence parks

This commit is contained in:
Ted John 2018-05-21 19:23:50 +01:00
parent 6af0cb2b88
commit 820fedb3df
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/title/TitleSequencePlayer.cpp
View File

@ -22,6 +22,7 @@
#include "../core/Math.hpp" #include "../core/Math.hpp"
#include "../core/Path.hpp" #include "../core/Path.hpp"
#include "../core/String.hpp" #include "../core/String.hpp"
#include "../object/ObjectManager.h"
#include "../OpenRCT2.h" #include "../OpenRCT2.h"
#include "../ParkImporter.h" #include "../ParkImporter.h"
#include "../scenario/ScenarioRepository.h" #include "../scenario/ScenarioRepository.h"
@ -417,7 +418,11 @@ private:
else else
{ {
auto parkImporter = ParkImporter::Create(path); auto parkImporter = ParkImporter::Create(path);
parkImporter->Load(path); auto result = parkImporter->Load(path);
auto objectManager = GetContext()->GetObjectManager();
objectManager->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import(); parkImporter->Import();
} }
PrepareParkForPlayback(); PrepareParkForPlayback();
@ -452,7 +457,11 @@ private:
std::string extension = Path::GetExtension(hintPath); std::string extension = Path::GetExtension(hintPath);
bool isScenario = ParkImporter::ExtensionIsScenario(hintPath); bool isScenario = ParkImporter::ExtensionIsScenario(hintPath);
auto parkImporter = ParkImporter::Create(hintPath); auto parkImporter = ParkImporter::Create(hintPath);
parkImporter->LoadFromStream(stream, isScenario); auto result = parkImporter->LoadFromStream(stream, isScenario);
auto objectManager = GetContext()->GetObjectManager();
objectManager->LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import(); parkImporter->Import();
} }
PrepareParkForPlayback(); PrepareParkForPlayback();