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

handle empty string tables

Browse Source
This commit is contained in:
Ted John
2016-06-26 21:43:30 +01:00
parent 1af6242381
commit a0d8b9ccbf
12 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/object/WaterObject.cpp
View File

@@ -36,14 +36,14 @@ void WaterObject::ReadLegacy(IStream * stream)
_legacyType.var_0A = stream->ReadValue<uint32>();
_legacyType.var_0E = stream->ReadValue<uint16>();
GetStringTable().Read(stream, OBJ_STRING_ID_NAME);
GetImageTable().Read(stream);
GetStringTable()->Read(stream, OBJ_STRING_ID_NAME);
GetImageTable()->Read(stream);
}
void WaterObject::Load()
{
_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.var_06 = _legacyType.image_id + 1;
_legacyType.var_0A = _legacyType.image_id + 4;
@@ -61,5 +61,6 @@ void WaterObject::Unload()
const utf8 * WaterObject::GetName()
{
return GetStringTable().GetString(OBJ_STRING_ID_NAME);
const utf8 * name = GetStringTable()->GetString(OBJ_STRING_ID_NAME);
return name != nullptr ? name : "";
}