From ad21e962eece4c85e5f842b1aad7714f14575d64 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 5 Dec 2017 16:42:09 +0100 Subject: [PATCH] Allow import of RCT1 Ice Cream Stall --- src/openrct2/object/RideObject.cpp | 9 ++++++--- src/openrct2/ride/RideData.cpp | 4 ++-- src/openrct2/sprites.h | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index d09d19ca4c..5f604122e2 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -542,6 +542,9 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root) sint32 previewImg = 0; sint32 imageStart = 0; + _legacyType.shop_item = SHOP_ITEM_NONE; + _legacyType.shop_item_secondary = SHOP_ITEM_NONE; + if (String::Equals(rideType, "restroom") || String::Equals(rideType, "toilets")) // object tool should be fixed to generate toilets, not restroom. { @@ -553,13 +556,13 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root) { _legacyType.ride_type[0] = RIDE_TYPE_FOOD_STALL; previewImg = SPR_CSG_RIDE_PREVIEW_ICE_CREAM_STALL; - imageStart = 61281; + imageStart = SPR_CSG_ICE_CREAM_STALL_BEGIN; + _legacyType.shop_item = SHOP_ITEM_ICE_CREAM; } _legacyType.ride_type[1] = RIDE_TYPE_NULL; _legacyType.ride_type[2] = RIDE_TYPE_NULL; - _legacyType.shop_item = SHOP_ITEM_NONE; - _legacyType.shop_item_secondary = SHOP_ITEM_NONE; + if (String::Equals(rideType, "stall")) { diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index df604d8573..6305f9c05e 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -1538,7 +1538,7 @@ const uint32 ShopItemImage[SHOP_ITEM_COUNT] = { SPR_SHOP_ITEM_DRINK, SPR_SHOP_ITEM_BURGER, SPR_SHOP_ITEM_CHIPS, - SPR_SHOP_ITEM_ICE_CREAM, + SPR_CSG_ICE_CREAM_STALL_BEGIN + 3, SPR_SHOP_ITEM_CANDYFLOSS, SPR_SHOP_ITEM_EMPTY_CAN, SPR_SHOP_ITEM_RUBBISH, @@ -2092,7 +2092,7 @@ const rct_ride_properties RideProperties[RIDE_TYPE_COUNT] = { RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_16 | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS, 7, 15, 0, 0, 0, 0 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP - {RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | + {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_NO_VEHICLES | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_IS_SHOP | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_SELLS_FOOD, 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_FOOD_STALL diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index a327515f8d..e0d1001b91 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -875,6 +875,7 @@ enum { SPR_CSG_WALL_TEXTURE_SKYSCRAPER_A = SPR_CSG_BEGIN + 47377, SPR_CSG_WALL_TEXTURE_SKYSCRAPER_B = SPR_CSG_BEGIN + 47378, + SPR_CSG_ICE_CREAM_STALL_BEGIN = SPR_CSG_BEGIN + 60625, SPR_CSG_TOILETS_BEGIN = SPR_CSG_BEGIN + 61289, SPR_CSG_RIDE_PREVIEWS_BEGIN = SPR_CSG_BEGIN + 64195,