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

Use sourceGame parameter in JSON files instead of originalId

Browse Source
This commit is contained in:
Michael Steenbeek
2018-07-03 13:46:45 +02:00
committed by Gymnasiast
parent 71bd110526
commit 2a64ec7aff
13 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,8 @@ public:
item.ObjectEntry = *object->GetObjectEntry();
item.Path = path;
item.Name = object->GetName();
item.Source = object->GetSecondSourceGame();
item.Sources[0] = object->GetSourceGame();
item.Sources[1] = object->GetSecondSourceGame();
object->SetRepositoryItem(&item);
delete object;
return std::make_tuple(true, item);
@@ -126,7 +127,7 @@ protected:
stream->WriteValue(item.ObjectEntry);
stream->WriteString(item.Path);
stream->WriteString(item.Name);
stream->WriteValue(item.Source);
stream->WriteArray(item.Sources, 2);
switch (object_entry_get_type(&item.ObjectEntry))
{
@@ -159,7 +160,10 @@ protected:
item.ObjectEntry = stream->ReadValue<rct_object_entry>();
item.Path = stream->ReadStdString();
item.Name = stream->ReadStdString();
item.Source = stream->ReadValue<uint8_t>();
auto sources = stream->ReadArray<uint8_t>(2);
item.Sources[0] = sources[0];
item.Sources[1] = sources[1];
Memory::Free(sources);
switch (object_entry_get_type(&item.ObjectEntry))
{