mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Fix vehicle name fallback

Browse Source
This commit is contained in:
Michael Steenbeek
2017-11-22 16:52:07 +01:00
parent 7bffc4ae33
commit 430d95bd95
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/object/Object.cpp
View File

@@ -50,11 +50,15 @@ const utf8 * Object::GetOverrideString(uint8 index) const
const utf8 * Object::GetString(uint8 index) const
{
const utf8 * sz = GetOverrideString(index);
if (sz == nullptr)
auto sz = GetOverrideString(index);
if (sz == nullptr && index == OBJ_STRING_ID_VEHICLE_NAME)
{
// If no vehicle name is specified, fall back to the ride name. This is also required if we fall back
// to the .DAT name (which does not contain separate ride and vehicle names).
return GetName();
}
else if (sz == nullptr)
{
// DAT objects do not contain separate ride and vehicle names
index = (index < OBJ_STRING_ID_VEHICLE_NAME) ? index : OBJ_STRING_ID_NAME;
sz = GetStringTable()->GetString(index);
}
return sz != nullptr ? sz : "";