mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 04:05:49 +01:00
Code Issues Releases Wiki Activity

Fold vehicle name into regular name

Browse Source
This commit is contained in:
Michael Steenbeek
2017-12-22 15:08:00 +01:00
parent 558cc07cb0
commit 2e79aaf54c
10 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,13 +51,7 @@ std::string Object::GetOverrideString(uint8 index) const
std::string Object::GetString(uint8 index) const
{
auto sz = GetOverrideString(index);
if (sz.empty() && 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.empty())
if (sz.empty())
{
sz = GetStringTable()->GetString(index);
}