mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Create ObjectEntryDescriptor to properly handle mixed DAT and JSON

Browse Source
This commit is contained in:
Gymnasiast
2020-12-02 16:50:21 +01:00
parent aa8a08987f
commit 596aa71093
9 changed files with 99 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
{
private:
static constexpr uint32_t MAGIC_NUMBER = 0x5844494F; // OIDX
static constexpr uint16_t VERSION = 23;
static constexpr uint16_t VERSION = 24;
static constexpr auto PATTERN = "*.dat;*.pob;*.json;*.parkobj";
IObjectRepository& _objectRepository;
@@ -163,7 +163,7 @@ protected:
stream->WriteValue<uint16_t>(static_cast<uint16_t>(item.SceneryGroupInfo.Entries.size()));
for (const auto& entry : item.SceneryGroupInfo.Entries)
{
stream->WriteValue<rct_object_entry>(entry);
stream->WriteObjectEntryDescriptor(entry);
}
break;
default:
@@ -211,10 +211,10 @@ protected:
case ObjectType::SceneryGroup:
{
auto numEntries = stream->ReadValue<uint16_t>();
item.SceneryGroupInfo.Entries = std::vector<rct_object_entry>(numEntries);
item.SceneryGroupInfo.Entries = std::vector<ObjectEntryDescriptor>(numEntries);
for (size_t i = 0; i < numEntries; i++)
{
item.SceneryGroupInfo.Entries[i] = stream->ReadValue<rct_object_entry>();
item.SceneryGroupInfo.Entries[i] = stream->ReadObjectEntryDescriptor();
}
break;
}
@@ -310,6 +310,14 @@ public:
return nullptr;
}
const ObjectRepositoryItem* FindObject(const ObjectEntryDescriptor& entry) const override final
{
if (entry.Generation == ObjectGeneration::DAT)
return FindObject(&entry.Entry);
return FindObject(entry.Identifier);
}
std::unique_ptr<Object> LoadObject(const ObjectRepositoryItem* ori) override
{
Guard::ArgumentNotNull(ori, GUARD_LINE);