1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00

Fix #13574: Object selection crashes if 'originalId' missing

This commit is contained in:
Michael Steenbeek
2020-12-23 20:12:25 +01:00
committed by GitHub
parent 8bab0c7479
commit 90964b38bb
2 changed files with 8 additions and 0 deletions

View File

@@ -108,6 +108,12 @@ struct rct_object_entry
return static_cast<ObjectType>(flags & 0x0F);
}
void SetType(ObjectType newType)
{
flags &= ~0x0F;
flags |= (static_cast<uint8_t>(newType) & 0x0F);
}
std::optional<uint8_t> GetSceneryType() const;
ObjectSourceGame GetSourceGame() const

View File

@@ -450,6 +450,8 @@ namespace ObjectFactory
originalName = originalId.substr(9, 8);
entry.checksum = std::stoul(originalId.substr(18, 8), nullptr, 16);
}
// Always set, since originalId might be missing or incorrect.
entry.SetType(objectType);
auto minLength = std::min<size_t>(8, originalName.length());
std::memcpy(entry.name, originalName.c_str(), minLength);