mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 11:15:13 +01:00
Code Issues Releases Wiki Activity

Allow cars property to be a single object

Browse Source
This commit is contained in:
Ted John
2017-12-23 19:55:52 +00:00
committed by Gymnasiast
parent a695dc953e
commit f700c661d8
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,8 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
void RideObject::Load()
{
_legacyType.obj = this;
GetStringTable().Sort();
_legacyType.naming.name = language_allocate_object_string(GetName());
_legacyType.naming.description = language_allocate_object_string(GetDescription());
@@ -709,11 +711,20 @@ void RideObject::ReadJsonVehicleInfo(IReadObjectContext * context, const json_t
std::vector<rct_ride_entry_vehicle> RideObject::ReadJsonCars(const json_t * jCars)
{
std::vector<rct_ride_entry_vehicle> cars;
json_t * jCar;
size_t index;
json_array_foreach(jCars, index, jCar)
if (json_is_array(jCars))
{
auto car = ReadJsonCar(jCar);
json_t * jCar;
size_t index;
json_array_foreach(jCars, index, jCar)
{
auto car = ReadJsonCar(jCar);
cars.push_back(car);
}
}
else if (json_is_object(jCars))
{
auto car = ReadJsonCar(jCars);
cars.push_back(car);
}
return cars;

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

@@ -126,6 +126,7 @@ struct rct_ride_entry {
uint8 shop_item; // 0x1C0
uint8 shop_item_secondary; // 0x1C1
rct_string_id capacity;
void * obj;
};
#pragma pack(pop)