mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Return image and string table by reference

Browse Source
This commit is contained in:
Ted John
2017-12-11 13:06:59 +00:00
committed by Gymnasiast
parent c3f075d18c
commit ec446ac9d6
16 changed files with 95 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/object/WallObject.cpp
View File

@@ -31,12 +31,12 @@ void WallObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
_legacyType.wall.scenery_tab_id = stream->ReadValue<uint8>();
_legacyType.wall.scrolling_mode = stream->ReadValue<uint8>();
GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME);
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
SetPrimarySceneryGroup(&sgEntry);
GetImageTable()->Read(context, stream);
GetImageTable().Read(context, stream);
// Validate properties
if (_legacyType.wall.price <= 0)
@@ -47,15 +47,15 @@ void WallObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
void WallObject::Load()
{
GetStringTable()->Sort();
GetStringTable().Sort();
_legacyType.name = language_allocate_object_string(GetName());
_legacyType.image = gfx_object_allocate_images(GetImageTable()->GetImages(), GetImageTable()->GetCount());
_legacyType.image = gfx_object_allocate_images(GetImageTable().GetImages(), GetImageTable().GetCount());
}
void WallObject::Unload()
{
language_free_object_string(_legacyType.name);
gfx_object_free_images(_legacyType.image, GetImageTable()->GetCount());
gfx_object_free_images(_legacyType.image, GetImageTable().GetCount());
_legacyType.name = 0;
_legacyType.image = 0;