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

handle object load exceptions

Browse Source
This commit is contained in:
Ted John
2016-06-26 21:55:14 +01:00
parent a0d8b9ccbf
commit 6d80f2bc79
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/object/ObjectFactory.cpp
View File

@@ -14,6 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../core/Console.hpp"
#include "../core/FileStream.hpp"
#include "../core/Memory.hpp"
#include "../core/MemoryStream.h"
@@ -57,7 +58,17 @@ namespace ObjectFactory
bufferSize = sawyercoding_read_chunk_with_size(file, (uint8 *)buffer, bufferSize);
buffer = Memory::Reallocate(buffer, bufferSize);
auto ms = MemoryStream(buffer, bufferSize);
result->ReadLegacy(&ms);
try
{
result->ReadLegacy(&ms);
}
catch (Exception ex)
{
Console::Error::WriteFormat("Error reading object: '%s'", path);
Console::Error::WriteLine();
delete result;
result = nullptr;
}
}
}
SDL_RWclose(file);