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

protect objects against invalid allocation ids

Browse Source
This commit is contained in:
Ted John
2016-07-03 18:02:18 +01:00
parent 80381cfaa0
commit 52928e1e08
26 changed files with 78 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/object/LargeSceneryObject.cpp
View File

@@ -37,9 +37,7 @@ LargeSceneryObject::~LargeSceneryObject()
void LargeSceneryObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
{
_legacyType.name = stream->ReadValue<rct_string_id>();
_legacyType.image = stream->ReadValue<uint32>();
stream->Seek(6, STREAM_SEEK_CURRENT);
_legacyType.large_scenery.tool_id = stream->ReadValue<uint8>();
_legacyType.large_scenery.flags = stream->ReadValue<uint8>();
_legacyType.large_scenery.price = stream->ReadValue<sint16>();
@@ -115,6 +113,9 @@ void LargeSceneryObject::Unload()
{
language_free_object_string(_legacyType.name);
gfx_object_free_images(_legacyType.image, GetImageTable()->GetCount());
_legacyType.name = 0;
_legacyType.image = 0;
}
void LargeSceneryObject::DrawPreview(rct_drawpixelinfo * dpi) const