mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Code Issues Releases Wiki Activity

Allow re-creation of object manager

Browse Source 
Removing lazy initialisation of it.
This commit is contained in:
Ted John
2017-06-22 18:56:32 +01:00
committed by Michał Janiszewski
parent e2184f3e32
commit 3003393c87
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/object/ObjectManager.cpp
View File

@@ -547,16 +547,14 @@ private:
static std::unique_ptr<ObjectManager> _objectManager;
IObjectManager * CreateObjectManager(IObjectRepository * objectRepository)
{
_objectManager = std::unique_ptr<ObjectManager>(new ObjectManager(objectRepository));
return _objectManager.get();
}
IObjectManager * GetObjectManager()
{
if (_objectManager == nullptr)
{
IObjectRepository * objectRepository = GetObjectRepository();
if (objectRepository != nullptr)
{
_objectManager = std::unique_ptr<ObjectManager>(new ObjectManager(objectRepository));
}
}
return _objectManager.get();
}