From 2e79aaf54ccce146b65d73ca33a78d04f612d022 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 22 Dec 2017 15:08:00 +0100 Subject: [PATCH] Fold vehicle name into regular name --- data/language/en-GB.txt | 21 ++++++++++----------- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 4 ++-- src/openrct2/localisation/LanguagePack.cpp | 3 +-- src/openrct2/management/Research.cpp | 2 +- src/openrct2/object/Object.cpp | 8 +------- src/openrct2/object/Object.h | 1 - src/openrct2/object/RideObject.cpp | 8 -------- src/openrct2/object/RideObject.h | 1 - src/openrct2/ride/ride.h | 1 - 10 files changed, 16 insertions(+), 35 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index bee0266636..205268fe4f 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4931,39 +4931,38 @@ STR_DESC :Passengers ride in a gondola suspended by large rotating arms, rota STR_CPTY :8 passengers [BMSD] -STR_VEHN :Regular train +STR_NAME :Twister train [BMSU] -STR_VEHN :Stand-up train +STR_NAME :Stand-up twister train [BMFL] -STR_VEHN :Floorless train +STR_NAME :Floorless twister train [WMMINE] -STR_VEHN :Mine cars +STR_NAME :Mine cars [WMOUSE] -STR_VEHN :Mouse cars +STR_NAME :Mouse cars [STEEP1] -STR_VEHN :Horses +STR_NAME :Horses [STEEP2] -STR_VEHN :Motorbikes +STR_NAME :Motorbikes [SBOX] -STR_VEHN :Soap boxes +STR_NAME :Soap boxes #WW [CONDORRD] -STR_NAME :Condor Ride +STR_NAME :Condor train STR_DESC :Riding in special harnesses below the track, riders experience the feeling of flight as they swoop through the air in Condor-shaped trains STR_CPTY :4 passengers per car -STR_VEHN :Condor train #WW [CONGAEEL] -STR_NAME :Conger Eel Coaster +STR_NAME :Conger Eel train STR_DESC :A compact steel-tracked roller coaster where the Eel-shaped train travels through corkscrews and loops STR_CPTY :4 passengers per car diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index e02ede71d8..1af93579a4 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -1079,7 +1079,7 @@ static void window_new_ride_list_vehicles_for(const uint8 rideType, const rct_ri continue; } - const char * vehicleName = language_get_string(currentRideEntry->vehicleName); + const char * vehicleName = language_get_string(currentRideEntry->naming.name); if (numItems > 0) { diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index d0c5b0ead2..a31036c736 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2729,7 +2729,7 @@ static void window_ride_vehicle_mousedown(rct_window *w, rct_widgetindex widgetI selectedIndex = numItems; gDropdownItemsFormat[numItems] = STR_DROPDOWN_MENU_LABEL; - gDropdownItemsArgs[numItems] = (rideEntryIndex << 16) | currentRideEntry->vehicleName; + gDropdownItemsArgs[numItems] = (rideEntryIndex << 16) | currentRideEntry->naming.name; numItems++; } @@ -2825,7 +2825,7 @@ static void window_ride_vehicle_invalidate(rct_window *w) carsPerTrain = ride->num_cars_per_train - rideEntry->zero_cars; // Vehicle type - window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].text = rideEntry->vehicleName; + window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].text = rideEntry->naming.name; // Trains if (rideEntry->cars_per_flat_ride > 1 || gCheatsDisableTrainLengthLimit) { diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index dcc1caa7f5..0b6eeadf63 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -34,7 +34,7 @@ constexpr uint64 MAX_OBJECT_OVERRIDES = 4096; constexpr uint64 MAX_SCENARIO_OVERRIDES = 4096; constexpr rct_string_id ObjectOverrideBase = 0x6000; -constexpr sint32 ObjectOverrideMaxStringCount = 4; +constexpr sint32 ObjectOverrideMaxStringCount = 3; constexpr rct_string_id ScenarioOverrideBase = 0x7000; constexpr sint32 ScenarioOverrideMaxStringCount = 3; @@ -506,7 +506,6 @@ private: if (String::Equals(identifier, "STR_NAME")) { stringId = 0; } else if (String::Equals(identifier, "STR_DESC")) { stringId = 1; } else if (String::Equals(identifier, "STR_CPTY")) { stringId = 2; } - else if (String::Equals(identifier, "STR_VEHN")) { stringId = 3; } else if (String::Equals(identifier, "STR_SCNR")) { stringId = 0; } else if (String::Equals(identifier, "STR_PARK")) { stringId = 1; } diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index b75014ab49..ea12e187c3 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -276,7 +276,7 @@ void research_finish_item(uint32 entryIndex) rct_ride_name baseRideNaming = get_ride_naming(base_ride_type, rideEntry); set_format_arg(0, rct_string_id, baseRideNaming.name); - set_format_arg(2, rct_string_id, rideEntry->vehicleName); + set_format_arg(2, rct_string_id, rideEntry->naming.name); } if (!gSilentResearch) diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index e78bfaded3..aa94411adc 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -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); } diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index c193e129c7..5db3b04f2f 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -32,7 +32,6 @@ enum OBJ_STRING_ID OBJ_STRING_ID_PARK_NAME = 1, OBJ_STRING_ID_SCENARIO_DETAILS = 2, OBJ_STRING_ID_CAPACITY = 2, - OBJ_STRING_ID_VEHICLE_NAME = 3, }; interface IStream; diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 5137efbbb3..4b02d3165a 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -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++) diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h index f7068f65f8..bd320eea30 100644 --- a/src/openrct2/object/RideObject.h +++ b/src/openrct2/object/RideObject.h @@ -44,7 +44,6 @@ public: std::string GetDescription() const; std::string GetCapacity() const; - std::string GetVehicleName() const; void SetRepositoryItem(ObjectRepositoryItem * item) const override; diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h index 9195b00381..acd25528ae 100644 --- a/src/openrct2/ride/ride.h +++ b/src/openrct2/ride/ride.h @@ -126,7 +126,6 @@ typedef struct rct_ride_entry { uint8 shop_item; // 0x1C0 uint8 shop_item_secondary; // 0x1C1 rct_string_id capacity; - rct_string_id vehicleName; } rct_ride_entry; /**