mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +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

24
src/object/ObjectFactory.cpp
View File

@@ -167,6 +167,30 @@ namespace ObjectFactory
return result;
}
Object * CreateObjectFromLegacyData(const rct_object_entry * entry, const void * data, size_t dataSize)
{
Guard::ArgumentNotNull(entry);
Guard::ArgumentNotNull(data);
Object * result = CreateObject(*entry);
if (result != nullptr)
{
utf8 objectName[9] = { 0 };
Memory::Copy(objectName, entry->name, 8);
auto readContext = ReadObjectContext(objectName);
auto chunkStream = MemoryStream(data, dataSize);
ReadObjectLegacy(result, &readContext, &chunkStream);
if (readContext.WasError())
{
delete result;
result = nullptr;
}
}
return result;
}
Object * CreateObject(const rct_object_entry &entry)
{
Object * result = nullptr;