mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +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/WaterObject.cpp
View File

@@ -25,15 +25,15 @@ void WaterObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
stream->Seek(14, STREAM_SEEK_CURRENT);
_legacyType.flags = stream->ReadValue<uint16>();
GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME);
GetImageTable()->Read(context, stream);
GetStringTable().Read(context, stream, OBJ_STRING_ID_NAME);
GetImageTable().Read(context, stream);
}
void WaterObject::Load()
{
GetStringTable()->Sort();
GetStringTable().Sort();
_legacyType.string_idx = language_allocate_object_string(GetName());
_legacyType.image_id = gfx_object_allocate_images(GetImageTable()->GetImages(), GetImageTable()->GetCount());
_legacyType.image_id = gfx_object_allocate_images(GetImageTable().GetImages(), GetImageTable().GetCount());
_legacyType.palette_index_1 = _legacyType.image_id + 1;
_legacyType.palette_index_2 = _legacyType.image_id + 4;
@@ -42,7 +42,7 @@ void WaterObject::Load()
void WaterObject::Unload()
{
gfx_object_free_images(_legacyType.image_id, GetImageTable()->GetCount());
gfx_object_free_images(_legacyType.image_id, GetImageTable().GetCount());
language_free_object_string(_legacyType.string_idx);
_legacyType.string_idx = 0;