mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +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

15
src/object/StexObject.cpp
View File

@@ -37,9 +37,9 @@ void StexObject::ReadLegacy(IStream * stream)
_legacyType.var_06 = stream->ReadValue<uint8>();
stream->Seek(1, STREAM_SEEK_CURRENT);
GetStringTable().Read(stream, OBJ_STRING_ID_SCENARIO_NAME);
GetStringTable().Read(stream, OBJ_STRING_ID_PARK_NAME);
GetStringTable().Read(stream, OBJ_STRING_ID_SCENARIO_DETAILS);
GetStringTable()->Read(stream, OBJ_STRING_ID_SCENARIO_NAME);
GetStringTable()->Read(stream, OBJ_STRING_ID_PARK_NAME);
GetStringTable()->Read(stream, OBJ_STRING_ID_SCENARIO_DETAILS);
}
void StexObject::Load()
@@ -63,15 +63,18 @@ const utf8 * StexObject::GetName()
const utf8 * StexObject::GetScenarioName()
{
return GetStringTable().GetString(OBJ_STRING_ID_SCENARIO_NAME);
const utf8 * name = GetStringTable()->GetString(OBJ_STRING_ID_SCENARIO_NAME);
return name != nullptr ? name : "";
}
const utf8 * StexObject::GetScenarioDetails()
{
return GetStringTable().GetString(OBJ_STRING_ID_SCENARIO_DETAILS);
const utf8 * name = GetStringTable()->GetString(OBJ_STRING_ID_SCENARIO_DETAILS);
return name != nullptr ? name : "";
}
const utf8 * StexObject::GetParkName()
{
return GetStringTable().GetString(OBJ_STRING_ID_PARK_NAME);
const utf8 * name = GetStringTable()->GetString(OBJ_STRING_ID_PARK_NAME);
return name != nullptr ? name : "";
}