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

Fix bugs with zip and object manager changes

This commit is contained in:
Ted John 2018-05-04 21:42:20 +01:00
parent 23efe7f339
commit 9aef466b9b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/object/ObjectFactory.cpp
View File

@ -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)

2
src/openrct2/object/ObjectRepository.cpp
View File

@ -82,7 +82,7 @@ class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
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;