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

Fix read / write of DAT object entries

This commit is contained in:
Ted John 2021-04-06 21:03:01 +01:00
parent 3173a63726
commit 3f55053d9c
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/ParkFile.cpp
View File

@ -222,21 +222,27 @@ namespace OpenRCT2
{
auto kind = cs.Read<uint8_t>();
ObjectEntryDescriptor desc;
switch (kind)
{
case DESCRIPTOR_NONE:
break;
case DESCRIPTOR_DAT:
cs.Read(&desc.Entry, sizeof(rct_object_entry));
{
rct_object_entry datEntry;
cs.Read(&datEntry, sizeof(datEntry));
ObjectEntryDescriptor desc(datEntry);
requiredObjects.SetObject(j, desc);
break;
}
case DESCRIPTOR_JSON:
{
ObjectEntryDescriptor desc;
desc.Type = objectType;
desc.Identifier = cs.Read<std::string>();
desc.Version = cs.Read<std::string>();
requiredObjects.SetObject(j, desc);
break;
}
default:
throw std::runtime_error("Unknown object descriptor kind.");
}
@ -1234,7 +1240,7 @@ namespace OpenRCT2
ReadWritePeep(cs, entity);
}
std::vector<TileCoordsXY> GetPatrolArea(uint32_t staffId)
static std::vector<TileCoordsXY> GetPatrolArea(uint32_t staffId)
{
std::vector<TileCoordsXY> area;
auto hasPatrol = gStaffModes[staffId] == StaffMode::Patrol;
@ -1266,7 +1272,7 @@ namespace OpenRCT2
return area;
}
void SetPatrolArea(uint32_t staffId, const std::vector<TileCoordsXY>& area)
static void SetPatrolArea(uint32_t staffId, const std::vector<TileCoordsXY>& area)
{
if (area.empty())
{

14
src/openrct2/object/ObjectManager.cpp
View File

@ -113,9 +113,17 @@ public:
auto obj = GetLoadedObject(objectType, i);
if (obj != nullptr)
{
auto entry = ObjectEntryDescriptor(obj->GetIdentifier());
entry.Type = obj->GetObjectType();
objectList.SetObject(i, entry);
if (obj->IsJsonObject())
{
auto entry = ObjectEntryDescriptor(obj->GetIdentifier());
entry.Type = obj->GetObjectType();
objectList.SetObject(i, entry);
}
else
{
auto entry = ObjectEntryDescriptor(*obj->GetObjectEntry());
objectList.SetObject(i, entry);
}
}
}
}