mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +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/RideObject.cpp
View File

@@ -127,7 +127,6 @@ void RideObject::Load()
_legacyType.naming.name = language_allocate_object_string(GetName());
_legacyType.naming.description = language_allocate_object_string(GetDescription());
_legacyType.capacity = language_allocate_object_string(GetCapacity());
_legacyType.vehicleName = language_allocate_object_string(GetVehicleName());
_legacyType.images_offset = gfx_object_allocate_images(GetImageTable()->GetImages(), GetImageTable()->GetCount());
_legacyType.vehicle_preset_list = &_presetColours;
@@ -302,13 +301,11 @@ void RideObject::Unload()
language_free_object_string(_legacyType.naming.name);
language_free_object_string(_legacyType.naming.description);
language_free_object_string(_legacyType.capacity);
language_free_object_string(_legacyType.vehicleName);
gfx_object_free_images(_legacyType.images_offset, GetImageTable()->GetCount());
_legacyType.naming.name = 0;
_legacyType.naming.description = 0;
_legacyType.capacity = 0;
_legacyType.vehicleName = 0;
_legacyType.images_offset = 0;
}
@@ -337,11 +334,6 @@ std::string RideObject::GetCapacity() const
return GetString(OBJ_STRING_ID_CAPACITY);
}
std::string 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++)