mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

Apply review fixes

Browse Source
This commit is contained in:
Ted John
2018-03-25 14:30:48 +01:00
committed by Gymnasiast
parent 046199c660
commit 918562f622
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -732,6 +732,11 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t * jCar)
car.car_mass = ObjectJsonHelpers::GetInteger(jCar, "mass"); car.car_mass = ObjectJsonHelpers::GetInteger(jCar, "mass");
car.tab_height = ObjectJsonHelpers::GetInteger(jCar, "tabOffset"); car.tab_height = ObjectJsonHelpers::GetInteger(jCar, "tabOffset");
car.num_seats = ObjectJsonHelpers::GetInteger(jCar, "numSeats"); car.num_seats = ObjectJsonHelpers::GetInteger(jCar, "numSeats");
if (ObjectJsonHelpers::GetBoolean(jCar, "seatsInPairs"))
{
car.num_seats |= 0x80;
}
car.sprite_width = ObjectJsonHelpers::GetInteger(jCar, "spriteWidth"); car.sprite_width = ObjectJsonHelpers::GetInteger(jCar, "spriteWidth");
car.sprite_height_negative = ObjectJsonHelpers::GetInteger(jCar, "spriteHeightNegative"); car.sprite_height_negative = ObjectJsonHelpers::GetInteger(jCar, "spriteHeightNegative");
car.sprite_height_positive = ObjectJsonHelpers::GetInteger(jCar, "spriteHeightPositive"); car.sprite_height_positive = ObjectJsonHelpers::GetInteger(jCar, "spriteHeightPositive");
@@ -767,11 +772,12 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t * jCar)
auto jLoadingWaypoints = json_object_get(jCar, "loadingWaypoints"); auto jLoadingWaypoints = json_object_get(jCar, "loadingWaypoints");
if (json_is_array(jLoadingWaypoints)) if (json_is_array(jLoadingWaypoints))
{ {
car.flags |= VEHICLE_ENTRY_FLAG_26;
auto numSegments = ObjectJsonHelpers::GetInteger(jCar, "numSegments"); auto numSegments = ObjectJsonHelpers::GetInteger(jCar, "numSegments");
if (numSegments == 8) if (numSegments == 8)
{ {
car.flags |= VEHICLE_ENTRY_FLAG_26; peepLoadingPositions.push_back(1);
peepLoadingPositions.push_back(0);
} }
else if (numSegments == 4) else if (numSegments == 4)
{ {