From 820fedb3df178d8c11fdf7e9c0d86110ee124a20 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 21 May 2018 19:23:50 +0100 Subject: [PATCH] Fix loading title sequence parks --- src/openrct2/title/TitleSequencePlayer.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index 95e2aaaf53..c22d0f0722 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -22,6 +22,7 @@ #include "../core/Math.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" +#include "../object/ObjectManager.h" #include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../scenario/ScenarioRepository.h" @@ -417,7 +418,11 @@ private: else { 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(); } PrepareParkForPlayback(); @@ -452,7 +457,11 @@ private: std::string extension = Path::GetExtension(hintPath); bool isScenario = ParkImporter::ExtensionIsScenario(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(); } PrepareParkForPlayback();