mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix rebase errors
This commit is contained in:
parent
2d037fb3ae
commit
27a055653c
|
@ -553,7 +553,7 @@ static uint8 ParseRideType(const std::string &s)
|
|||
{ "miniature_railway", RIDE_TYPE_MINIATURE_RAILWAY },
|
||||
{ "monorail", RIDE_TYPE_MONORAIL },
|
||||
{ "mini_suspended_rc", RIDE_TYPE_MINI_SUSPENDED_COASTER },
|
||||
{ "boat_hire", RIDE_TYPE_BOAT_RIDE },
|
||||
{ "boat_hire", RIDE_TYPE_BOAT_HIRE },
|
||||
{ "wooden_wild_mouse", RIDE_TYPE_WOODEN_WILD_MOUSE },
|
||||
{ "steeplechase", RIDE_TYPE_STEEPLECHASE },
|
||||
{ "car_ride", RIDE_TYPE_CAR_RIDE },
|
||||
|
@ -663,8 +663,8 @@ static uint8 ParseShopItem(const std::string &s)
|
|||
{ "popcorn", SHOP_ITEM_POPCORN },
|
||||
{ "hotdog", SHOP_ITEM_HOT_DOG },
|
||||
{ "seafood", SHOP_ITEM_TENTACLE },
|
||||
{ "candyapple", SHOP_ITEM_CANDY_APPLE },
|
||||
{ "donut", SHOP_ITEM_DONUT },
|
||||
{ "candyapple", SHOP_ITEM_TOFFEE_APPLE },
|
||||
{ "donut", SHOP_ITEM_DOUGHNUT },
|
||||
{ "chicken", SHOP_ITEM_CHICKEN },
|
||||
{ "pretzel", SHOP_ITEM_PRETZEL },
|
||||
{ "funnelcake", SHOP_ITEM_FUNNEL_CAKE },
|
||||
|
|
Loading…
Reference in New Issue