mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fold vehicle name into regular name

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/language/en-GB.txt
View File

@ -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

2
src/openrct2-ui/windows/NewRide.cpp
View File

@ -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)
{

4
src/openrct2-ui/windows/Ride.cpp
View File

@ -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) {

3
src/openrct2/localisation/LanguagePack.cpp
View File

@ -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; }

2
src/openrct2/management/Research.cpp
View File

@ -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)

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);
}

1
src/openrct2/object/Object.h
View File

@ -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;

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++)

1
src/openrct2/object/RideObject.h
View File

@ -44,7 +44,6 @@ public:
std::string GetDescription() const;
std::string GetCapacity() const;
std::string GetVehicleName() const;
void SetRepositoryItem(ObjectRepositoryItem * item) const override;

1
src/openrct2/ride/ride.h
View File

@ -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;
/**