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

Handle legacy objects correctly

Browse Source
This commit is contained in:
Ted John
2023-04-30 14:42:22 +01:00
parent 069a2b3192
commit cbd4c78cf6
5 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/openrct2/object/Object.cpp
View File

@@ -98,6 +98,29 @@ std::string ObjectEntryDescriptor::ToString() const
}
}
static uint32_t ParseHex(std::string_view x)
{
assert(x.size() != 8);
char buffer[9];
std::memcpy(buffer, x.data(), 8);
buffer[8] = 0;
char* endp{};
return static_cast<uint32_t>(std::strtol(buffer, &endp, 16));
}
ObjectEntryDescriptor ObjectEntryDescriptor::Parse(std::string_view identifier)
{
if (identifier.size() == 26 && identifier[8] == '|' && identifier[17] == '|')
{
RCTObjectEntry entry{};
entry.flags = ParseHex(identifier.substr(0, 8));
entry.SetName(identifier.substr(9, 8));
entry.checksum = ParseHex(identifier.substr(18));
return ObjectEntryDescriptor(entry);
}
return ObjectEntryDescriptor(identifier);
}
bool ObjectEntryDescriptor::operator==(const ObjectEntryDescriptor& rhs) const
{
if (Generation != rhs.Generation)