1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00

Clean up ride naming

This commit is contained in:
Michael Steenbeek
2017-09-19 12:18:17 +02:00
parent a24f2fba6a
commit fa5ec031f1
9 changed files with 123 additions and 111 deletions

View File

@@ -127,8 +127,8 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
void RideObject::Load()
{
GetStringTable()->Sort();
_legacyType.name = language_allocate_object_string(GetName());
_legacyType.description = language_allocate_object_string(GetDescription());
_legacyType.naming.name = language_allocate_object_string(GetName());
_legacyType.naming.description = language_allocate_object_string(GetDescription());
_legacyType.images_offset = gfx_object_allocate_images(GetImageTable()->GetImages(), GetImageTable()->GetCount());
_legacyType.vehicle_preset_list = &_presetColours;
@@ -302,12 +302,12 @@ void RideObject::Load()
void RideObject::Unload()
{
language_free_object_string(_legacyType.name);
language_free_object_string(_legacyType.description);
language_free_object_string(_legacyType.naming.name);
language_free_object_string(_legacyType.naming.description);
gfx_object_free_images(_legacyType.images_offset, GetImageTable()->GetCount());
_legacyType.name = 0;
_legacyType.description = 0;
_legacyType.naming.name = 0;
_legacyType.naming.description = 0;
_legacyType.images_offset = 0;
}