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

Small fixes

Browse Source
This commit is contained in:
Gymnasiast
2017-12-31 14:54:17 +01:00
parent 1d0799fc0d
commit 81a2c28e1b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,7 +742,7 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t * jCar)
rct_ride_entry_vehicle car = { 0 }; rct_ride_entry_vehicle car = { 0 };
car.rotation_frame_mask = ObjectJsonHelpers::GetInteger(jCar, "rotationFrameMask"); car.rotation_frame_mask = ObjectJsonHelpers::GetInteger(jCar, "rotationFrameMask");
car.spacing = ObjectJsonHelpers::GetInteger(jCar, "spacing"); car.spacing = ObjectJsonHelpers::GetInteger(jCar, "spacing");
car.car_friction = ObjectJsonHelpers::GetInteger(jCar, "friction"); 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");
car.sprite_width = ObjectJsonHelpers::GetInteger(jCar, "spriteWidth"); car.sprite_width = ObjectJsonHelpers::GetInteger(jCar, "spriteWidth");

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

@@ -25,7 +25,7 @@ class RideObject final : public Object
private: private:
rct_ride_entry _legacyType = { }; rct_ride_entry _legacyType = { };
vehicle_colour_preset_list _presetColours = { 0 }; vehicle_colour_preset_list _presetColours = { 0 };
std::vector<sint8> _peepLoadingPositions[4]; std::vector<sint8> _peepLoadingPositions[MAX_VEHICLES_PER_RIDE_ENTRY];
public: public:
explicit RideObject(const rct_object_entry &entry) : Object(entry) { } explicit RideObject(const rct_object_entry &entry) : Object(entry) { }