mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Handle mixed install object loading more gracefully

Browse Source
This commit is contained in:
duncanspumpkin
2021-11-26 16:59:46 +00:00
parent 7e7947fe8b
commit 2916daa29d
3 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/park/ParkFile.cpp
View File

@@ -299,7 +299,16 @@ namespace OpenRCT2
{
ObjectEntryDescriptor desc;
desc.Type = objectType;
desc.Identifier = MapToNewObjectIdentifier(cs.Read<std::string>());
auto identifier = cs.Read<std::string>();
if (version <= 2)
{
auto newIdentifier = MapToNewObjectIdentifier(identifier);
if (!newIdentifier.empty())
{
identifier = newIdentifier;
}
}
desc.Identifier = identifier;
desc.Version = cs.Read<std::string>();
if (version <= 2)