From 9aef466b9b2918a7f216da540c7e1ec0df392a73 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 4 May 2018 21:42:20 +0100 Subject: [PATCH] Fix bugs with zip and object manager changes --- src/openrct2/object/ObjectFactory.cpp | 2 +- src/openrct2/object/ObjectRepository.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 27b8a97925..233e0f1e9c 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -270,7 +270,7 @@ namespace ObjectFactory try { auto jRoot = Json::ReadFromFile(path.c_str()); - CreateObjectFromJson(objectRepository, jRoot); + result = CreateObjectFromJson(objectRepository, jRoot); json_decref(jRoot); } catch (const std::runtime_error &err) diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index a5af9b9e2e..6f2fa9baf9 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -82,7 +82,7 @@ class ObjectFileIndex final : public FileIndex private: static constexpr uint32 MAGIC_NUMBER = 0x5844494F; // OIDX static constexpr uint16 VERSION = 17; - static constexpr auto PATTERN = "*.dat;*.pob;*.json"; + static constexpr auto PATTERN = "*.dat;*.pob;*.json;*.parkobj"; IObjectRepository& _objectRepository;