mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Allow separate ride and vehicle names per ride entry

Browse Source
This commit is contained in:
Michael Steenbeek
2017-11-20 16:40:18 +01:00
parent 76dc490fca
commit c1400a12eb
10 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2/object/RideObject.cpp
View File

@@ -127,6 +127,10 @@ void RideObject::Load()
GetStringTable()->Sort();
_legacyType.naming.name = language_allocate_object_string(GetName());
_legacyType.naming.description = language_allocate_object_string(GetDescription());
#if defined(NO_RCT2)
_legacyType.capacity = language_allocate_object_string(GetCapacity());
_legacyType.vehicleName = language_allocate_object_string(GetVehicleName());
#endif
_legacyType.images_offset = gfx_object_allocate_images(GetImageTable()->GetImages(), GetImageTable()->GetCount());
_legacyType.vehicle_preset_list = &_presetColours;
@@ -302,10 +306,18 @@ void RideObject::Unload()
{
language_free_object_string(_legacyType.naming.name);
language_free_object_string(_legacyType.naming.description);
#ifdef NO_RCT2
language_free_object_string(_legacyType.capacity);
language_free_object_string(_legacyType.vehicleName);
#endif
gfx_object_free_images(_legacyType.images_offset, GetImageTable()->GetCount());
_legacyType.naming.name = 0;
_legacyType.naming.description = 0;
#ifdef NO_RCT2
_legacyType.capacity = 0;
_legacyType.vehicleName = 0;
#endif
_legacyType.images_offset = 0;
}
@@ -333,6 +345,11 @@ const utf8 * RideObject::GetCapacity() const
return GetString(OBJ_STRING_ID_CAPACITY);
}
const utf8 * RideObject::GetVehicleName() const
{
return GetString(OBJ_STRING_ID_VEHICLE_NAME);
}
void RideObject::SetRepositoryItem(ObjectRepositoryItem * item) const
{
for (sint32 i = 0; i < RCT2_MAX_RIDE_TYPES_PER_RIDE_ENTRY; i++)