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

don't export invalid objects

Browse Source
This commit is contained in:
Ted John
2016-07-09 14:52:56 +01:00
parent a25d7aa535
commit 8c2393f5c5
4 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/object/ObjectRepository.cpp
View File

@@ -207,20 +207,28 @@ public:
// TODO append checksum match bytes
// TODO check object is loadable before writing it
utf8 path[MAX_PATH];
GetPathForNewObject(path, sizeof(path), objectName);
Console::WriteLine("Adding object: [%s]", objectName);
try
// Check that the object is loadable before writing it
Object * object = ObjectFactory::CreateObjectFromLegacyData(objectEntry, data, dataSize);
if (object == nullptr)
{
SaveObject(path, objectEntry, data, dataSize);
ScanObject(path);
Console::Error::WriteFormat("[%s] Unable to export object.", objectName);
Console::Error::WriteLine();
}
catch (Exception ex)
else
{
Console::WriteLine("Failed saving object: [%s] to '%s'.", objectName, path);
utf8 path[MAX_PATH];
GetPathForNewObject(path, sizeof(path), objectName);
Console::WriteLine("Adding object: [%s]", objectName);
try
{
SaveObject(path, objectEntry, data, dataSize);
ScanObject(path);
}
catch (Exception ex)
{
Console::WriteLine("Failed saving object: [%s] to '%s'.", objectName, path);
}
}
}
@@ -895,6 +903,6 @@ static void ReportMissingObject(const rct_object_entry * entry)
{
utf8 objName[9] = { 0 };
Memory::Copy(objName, entry->name, 8);
Console::Error::WriteFormat("[%s]: Object not found.", objName);
Console::Error::WriteFormat("[%s] Object not found.", objName);
Console::Error::WriteLine();
}