mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix rides selling balloons

Browse Source
This commit is contained in:
Gymnasiast
2018-02-12 20:48:22 +01:00
parent 195ca24086
commit 860127e898
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -555,6 +555,10 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
_legacyType.max_height = ObjectJsonHelpers::GetInteger(properties, "maxHeight");
// This needs to be set for both shops/facilities _and_ regular rides.
_legacyType.shop_item = SHOP_ITEM_NONE;
_legacyType.shop_item_secondary = SHOP_ITEM_NONE;
if (IsRideTypeShopOrFacility(_legacyType.ride_type[0]))
{
// Standard car info for a shop
@@ -572,8 +576,6 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
// Shop item
auto rideSells = ObjectJsonHelpers::GetJsonStringArray(json_object_get(json_object_get(root, "properties"), "sells"));
_legacyType.shop_item = SHOP_ITEM_NONE;
_legacyType.shop_item_secondary = SHOP_ITEM_NONE;
if (rideSells.size() >= 1)
{
_legacyType.shop_item = ParseShopItem(rideSells[0]);