mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix bugs with zip and object manager changes
This commit is contained in:
parent
23efe7f339
commit
9aef466b9b
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue