mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 14:53:02 +01:00
Code Issues Releases Wiki Activity

Change json shop names to OpenRCT2 names

Browse Source
This commit is contained in:
Ted John
2018-03-27 21:55:38 +01:00
parent fa11f05dba
commit 808296e91f
1 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,13 +579,26 @@ void RideObject::ReadJson(IReadObjectContext * context, const json_t * root)
// Shop item // Shop item
auto rideSells = ObjectJsonHelpers::GetJsonStringArray(json_object_get(json_object_get(root, "properties"), "sells")); auto rideSells = ObjectJsonHelpers::GetJsonStringArray(json_object_get(json_object_get(root, "properties"), "sells"));
if (rideSells.size() >= 1) for (size_t i = 0; i < rideSells.size(); i++)
{ {
_legacyType.shop_item = ParseShopItem(rideSells[0]); auto shopItem = ParseShopItem(rideSells[i]);
} if (shopItem == SHOP_ITEM_NONE)
if (rideSells.size() >= 2) {
{ context->LogWarning(OBJECT_ERROR_INVALID_PROPERTY, "Unknown shop item");
_legacyType.shop_item_secondary = ParseShopItem(rideSells[1]); }
if (i == 0)
{
_legacyType.shop_item = ParseShopItem(rideSells[0]);
}
else if (i == 1)
{
_legacyType.shop_item_secondary = ParseShopItem(rideSells[1]);
}
else
{
// More than 2 shop items not supported yet!
}
} }
} }
else else
@@ -1036,9 +1049,6 @@ uint8 RideObject::ParseRideType(const std::string &s)
{ "mini_rc", RIDE_TYPE_MINI_ROLLER_COASTER }, { "mini_rc", RIDE_TYPE_MINI_ROLLER_COASTER },
{ "mine_ride", RIDE_TYPE_MINE_RIDE }, { "mine_ride", RIDE_TYPE_MINE_RIDE },
{ "lim_launched_rc", RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER }, { "lim_launched_rc", RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER },
// TEMPORARY:
{ "restroom", RIDE_TYPE_TOILETS },
}; };
auto result = LookupTable.find(s); auto result = LookupTable.find(s);
return (result != LookupTable.end()) ? return (result != LookupTable.end()) ?
@@ -1067,43 +1077,43 @@ uint8 RideObject::ParseShopItem(const std::string &s)
{ {
static const std::unordered_map<std::string, uint8> LookupTable static const std::unordered_map<std::string, uint8> LookupTable
{ {
{ "burger", SHOP_ITEM_BURGER }, { "burger", SHOP_ITEM_BURGER },
{ "fries", SHOP_ITEM_CHIPS }, { "chips", SHOP_ITEM_CHIPS },
{ "icecream", SHOP_ITEM_ICE_CREAM }, { "ice_cream", SHOP_ITEM_ICE_CREAM },
{ "cottoncandy", SHOP_ITEM_CANDYFLOSS }, { "candyfloss", SHOP_ITEM_CANDYFLOSS },
{ "pizza", SHOP_ITEM_PIZZA }, { "pizza", SHOP_ITEM_PIZZA },
{ "popcorn", SHOP_ITEM_POPCORN }, { "popcorn", SHOP_ITEM_POPCORN },
{ "hotdog", SHOP_ITEM_HOT_DOG }, { "hot_dog", SHOP_ITEM_HOT_DOG },
{ "seafood", SHOP_ITEM_TENTACLE }, { "tentacle", SHOP_ITEM_TENTACLE },
{ "candyapple", SHOP_ITEM_TOFFEE_APPLE }, { "toffee_apple", SHOP_ITEM_TOFFEE_APPLE },
{ "donut", SHOP_ITEM_DOUGHNUT }, { "doughnut", SHOP_ITEM_DOUGHNUT },
{ "chicken", SHOP_ITEM_CHICKEN }, { "chicken", SHOP_ITEM_CHICKEN },
{ "pretzel", SHOP_ITEM_PRETZEL }, { "pretzel", SHOP_ITEM_PRETZEL },
{ "funnelcake", SHOP_ITEM_FUNNEL_CAKE }, { "funnel_cake", SHOP_ITEM_FUNNEL_CAKE },
{ "beefnoodles", SHOP_ITEM_BEEF_NOODLES }, { "beef_noodles", SHOP_ITEM_BEEF_NOODLES },
{ "friednoodles", SHOP_ITEM_FRIED_RICE_NOODLES }, { "fried_rice_noodles", SHOP_ITEM_FRIED_RICE_NOODLES },
{ "wontonsoup", SHOP_ITEM_WONTON_SOUP }, { "wonton_soup", SHOP_ITEM_WONTON_SOUP },
{ "meatballsoup", SHOP_ITEM_MEATBALL_SOUP }, { "meatball_soup", SHOP_ITEM_MEATBALL_SOUP },
{ "subsandwich", SHOP_ITEM_SUB_SANDWICH }, { "sub_sandwich", SHOP_ITEM_SUB_SANDWICH },
{ "cookies", SHOP_ITEM_COOKIE }, { "cookies", SHOP_ITEM_COOKIE },
{ "roastsausage", SHOP_ITEM_ROAST_SAUSAGE }, { "roast_sausage", SHOP_ITEM_ROAST_SAUSAGE },
{ "cola", SHOP_ITEM_DRINK }, { "drink", SHOP_ITEM_DRINK },
{ "coffee", SHOP_ITEM_COFFEE }, { "coffee", SHOP_ITEM_COFFEE },
{ "lemonade", SHOP_ITEM_LEMONADE }, { "lemonade", SHOP_ITEM_LEMONADE },
{ "hotchocolate", SHOP_ITEM_CHOCOLATE }, { "chocolate", SHOP_ITEM_CHOCOLATE },
{ "icedtea", SHOP_ITEM_ICED_TEA }, { "iced_tea", SHOP_ITEM_ICED_TEA },
{ "fruitjuice", SHOP_ITEM_FRUIT_JUICE }, { "fruit_juice", SHOP_ITEM_FRUIT_JUICE },
{ "soybeanmilk", SHOP_ITEM_SOYBEAN_MILK }, { "soybean_milk", SHOP_ITEM_SOYBEAN_MILK },
{ "sujongkwa", SHOP_ITEM_SU_JONGKWA }, { "su_jongkwa", SHOP_ITEM_SU_JONGKWA },
{ "balloon", SHOP_ITEM_BALLOON }, { "balloon", SHOP_ITEM_BALLOON },
{ "plushtoy", SHOP_ITEM_TOY }, { "toy", SHOP_ITEM_TOY },
{ "map", SHOP_ITEM_MAP }, { "map", SHOP_ITEM_MAP },
{ "onridephoto", SHOP_ITEM_PHOTO }, { "photo", SHOP_ITEM_PHOTO },
{ "umbrella", SHOP_ITEM_UMBRELLA }, { "umbrella", SHOP_ITEM_UMBRELLA },
{ "voucher", SHOP_ITEM_VOUCHER }, { "voucher", SHOP_ITEM_VOUCHER },
{ "hat", SHOP_ITEM_HAT }, { "hat", SHOP_ITEM_HAT },
{ "tshirt", SHOP_ITEM_TSHIRT }, { "tshirt", SHOP_ITEM_TSHIRT },
{ "sunglasses", SHOP_ITEM_SUNGLASSES }, { "sunglasses", SHOP_ITEM_SUNGLASSES },
}; };
auto result = LookupTable.find(s); auto result = LookupTable.find(s);
return (result != LookupTable.end()) ? return (result != LookupTable.end()) ?