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

Import named car flags

This commit is contained in:
Ted John 2017-12-23 23:09:05 +00:00 committed by Gymnasiast
parent 2917336e75
commit 1d0799fc0d
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,7 +749,6 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t * jCar)
car.sprite_height_negative = ObjectJsonHelpers::GetInteger(jCar, "spriteHeightNegative");
car.sprite_height_positive = ObjectJsonHelpers::GetInteger(jCar, "spriteHeightPositive");
car.var_11 = ObjectJsonHelpers::GetInteger(jCar, "var11");
car.flags = ObjectJsonHelpers::GetInteger(jCar, "flags");
car.base_num_frames = ObjectJsonHelpers::GetInteger(jCar, "baseNumFrames");
car.no_vehicle_images = ObjectJsonHelpers::GetInteger(jCar, "numImages");
car.no_seating_rows = ObjectJsonHelpers::GetInteger(jCar, "numSeatRows");
@ -784,6 +783,40 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t * jCar)
{ "restraintAnimation", VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION },
{ "VEHICLE_SPRITE_FLAG_14", VEHICLE_SPRITE_FLAG_14 },
{ "VEHICLE_SPRITE_FLAG_15", VEHICLE_SPRITE_FLAG_15 } });
car.flags = ObjectJsonHelpers::GetFlags<uint32>(jCar, {
{ "VEHICLE_ENTRY_FLAG_0", VEHICLE_ENTRY_FLAG_0 },
{ "VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS", VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS },
{ "VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH", VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH },
{ "VEHICLE_ENTRY_FLAG_MINI_GOLF", VEHICLE_ENTRY_FLAG_MINI_GOLF },
{ "VEHICLE_ENTRY_FLAG_4", VEHICLE_ENTRY_FLAG_4 },
{ "VEHICLE_ENTRY_FLAG_5", VEHICLE_ENTRY_FLAG_5 },
{ "VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET", VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET },
{ "VEHICLE_ENTRY_FLAG_7", VEHICLE_ENTRY_FLAG_7 },
{ "VEHICLE_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED", VEHICLE_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED },
{ "VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2", VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2 },
{ "VEHICLE_ENTRY_FLAG_10", VEHICLE_ENTRY_FLAG_10 },
{ "VEHICLE_ENTRY_FLAG_11", VEHICLE_ENTRY_FLAG_11 },
{ "VEHICLE_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES", VEHICLE_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES },
{ "VEHICLE_ENTRY_FLAG_13", VEHICLE_ENTRY_FLAG_13 },
{ "VEHICLE_ENTRY_FLAG_14", VEHICLE_ENTRY_FLAG_14 },
{ "VEHICLE_ENTRY_FLAG_15", VEHICLE_ENTRY_FLAG_15 },
{ "VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_1", VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_1 },
{ "VEHICLE_ENTRY_FLAG_SWINGING", VEHICLE_ENTRY_FLAG_SWINGING },
{ "VEHICLE_ENTRY_FLAG_SPINNING", VEHICLE_ENTRY_FLAG_SPINNING },
{ "VEHICLE_ENTRY_FLAG_POWERED", VEHICLE_ENTRY_FLAG_POWERED },
{ "VEHICLE_ENTRY_FLAG_RIDERS_SCREAM", VEHICLE_ENTRY_FLAG_RIDERS_SCREAM },
{ "VEHICLE_ENTRY_FLAG_21", VEHICLE_ENTRY_FLAG_21 },
{ "VEHICLE_ENTRY_FLAG_22", VEHICLE_ENTRY_FLAG_22 },
{ "VEHICLE_ENTRY_FLAG_23", VEHICLE_ENTRY_FLAG_23 },
{ "VEHICLE_ENTRY_FLAG_24", VEHICLE_ENTRY_FLAG_24 },
{ "VEHICLE_ENTRY_FLAG_25", VEHICLE_ENTRY_FLAG_25 },
{ "VEHICLE_ENTRY_FLAG_26", VEHICLE_ENTRY_FLAG_26 },
{ "VEHICLE_ENTRY_FLAG_27", VEHICLE_ENTRY_FLAG_27 },
{ "VEHICLE_ENTRY_FLAG_28", VEHICLE_ENTRY_FLAG_28 },
{ "VEHICLE_ENTRY_FLAG_29", VEHICLE_ENTRY_FLAG_29 },
{ "VEHICLE_ENTRY_FLAG_30", VEHICLE_ENTRY_FLAG_30 },
{ "VEHICLE_ENTRY_FLAG_31", VEHICLE_ENTRY_FLAG_31 } });
return car;
}