From 7c6002cb26cb3fd5c56f1c7ff551517fc5e6a4f7 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Fri, 20 Jul 2018 17:48:36 +0200 Subject: [PATCH] Correct formatting in remaining files in libopenrct2 --- src/openrct2/ride/Ride.cpp | 86 +++-- src/openrct2/ride/RideGroupManager.cpp | 30 +- src/openrct2/ride/RideRatings.cpp | 64 ++-- src/openrct2/ride/ShopItem.cpp | 313 ++++--------------- src/openrct2/ride/TrackDesign.cpp | 10 +- src/openrct2/ride/TrackDesignRepository.cpp | 8 +- src/openrct2/ride/TrackPaint.cpp | 32 +- src/openrct2/ride/Vehicle.cpp | 13 +- src/openrct2/scenario/ScenarioRepository.cpp | 8 +- 9 files changed, 224 insertions(+), 340 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 2713b73fb7..569be7ad82 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -138,7 +138,9 @@ uint8_t gTypeToRideEntryIndexMap[TYPE_TO_RIDE_ENTRY_SLOTS]; #pragma endregion -static constexpr const int32_t RideInspectionInterval[] = { 10, 20, 30, 45, 60, 120, 0, 0 }; +static constexpr const int32_t RideInspectionInterval[] = { + 10, 20, 30, 45, 60, 120, 0, 0, +}; Ride gRideList[MAX_RIDES]; @@ -4805,9 +4807,19 @@ static constexpr const LocationXY16 word_9A3AB4[4] = { { -96, 0 }, }; +// clang-format off static constexpr const LocationXY16 word_9A2A60[] = { - { 0, 16 }, { 16, 31 }, { 31, 16 }, { 16, 0 }, { 16, 16 }, { 64, 64 }, { 64, -32 }, { -32, -32 }, { -32, 64 }, + { 0, 16 }, + { 16, 31 }, + { 31, 16 }, + { 16, 0 }, + { 16, 16 }, + { 64, 64 }, + { 64, -32 }, + { -32, -32 }, + { -32, 64 }, }; +// clang-format on /** * @@ -5927,9 +5939,11 @@ void ride_get_start_of_track(CoordsXYE* output) bool moveSlowIt = true; do { - CoordsXYE lastGood = { /* .x = */ trackBeginEnd.begin_x, - /* .y = */ trackBeginEnd.begin_y, - /* .element = */ trackBeginEnd.begin_element }; + CoordsXYE lastGood = { + /* .x = */ trackBeginEnd.begin_x, + /* .y = */ trackBeginEnd.begin_y, + /* .element = */ trackBeginEnd.begin_element, + }; if (!track_block_get_previous( trackBeginEnd.end_x, trackBeginEnd.end_y, trackBeginEnd.begin_element, &trackBeginEnd)) @@ -6974,13 +6988,15 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int3 { uint8_t bitmap[200][200] = { 0 }; - rct_drawpixelinfo dpi = { /*.bits = */ (uint8_t*)bitmap, - /*.x = */ -100, - /*.y = */ -100, - /*.width = */ 200, - /*.height = */ 200, - /*.pitch = */ 0, - /*.zoom_level = */ 0 }; + rct_drawpixelinfo dpi = { + /*.bits = */ (uint8_t*)bitmap, + /*.x = */ -100, + /*.y = */ -100, + /*.width = */ 200, + /*.height = */ 200, + /*.pitch = */ 0, + /*.zoom_level = */ 0, + }; for (int32_t i = 0; i < num_images; ++i) { @@ -7537,12 +7553,13 @@ uint8_t ride_entry_get_vehicle_at_position(int32_t rideEntryIndex, int32_t numCa uint64_t ride_entry_get_supported_track_pieces(const rct_ride_entry* rideEntry) { uint64_t supportedPieces = 0xFFFFFFFFFFFFFFFFULL; - uint16_t trackPieceRequiredSprites[55] - = { 0x0001u, 0x0001u, 0x0001u, 0x0000u, 0x0006u, 0x0002u, 0x0020u, 0x000E, 0x0003u, 0x0006u, 0x0007u, - 0x0002u, 0x0004u, 0x0001u, 0x0001u, 0x0001u, 0x0001u, 0x0061u, 0x000E, 0x1081u, 0x0001u, 0x0020u, - 0x0020u, 0x0001u, 0x0001u, 0x0000u, 0x0001u, 0x0001u, 0x000C, 0x0061u, 0x0002u, 0x000E, 0x0480u, - 0x0001u, 0x0061u, 0x0001u, 0x0001u, 0x000Fu, 0x0001u, 0x0200u, 0x0007u, 0x0008u, 0x0000u, 0x0000u, - 0x4000u, 0x0008u, 0x0001u, 0x0001u, 0x0061u, 0x0061u, 0x0008u, 0x0008u, 0x0001u, 0x000Eu, 0x000Eu }; + uint16_t trackPieceRequiredSprites[55] = { + 0x0001u, 0x0001u, 0x0001u, 0x0000u, 0x0006u, 0x0002u, 0x0020u, 0x000E, 0x0003u, 0x0006u, 0x0007u, + 0x0002u, 0x0004u, 0x0001u, 0x0001u, 0x0001u, 0x0001u, 0x0061u, 0x000E, 0x1081u, 0x0001u, 0x0020u, + 0x0020u, 0x0001u, 0x0001u, 0x0000u, 0x0001u, 0x0001u, 0x000C, 0x0061u, 0x0002u, 0x000E, 0x0480u, + 0x0001u, 0x0061u, 0x0001u, 0x0001u, 0x000Fu, 0x0001u, 0x0200u, 0x0007u, 0x0008u, 0x0000u, 0x0000u, + 0x4000u, 0x0008u, 0x0001u, 0x0001u, 0x0061u, 0x0061u, 0x0008u, 0x0008u, 0x0001u, 0x000Eu, 0x000Eu, + }; // Only check default vehicle; it's assumed the others will have correct sprites if this one does (I've yet to find an // exception, at least) @@ -8051,9 +8068,11 @@ void sub_6CB945(int32_t rideIndex) if (ride->station_starts[stationId].xy == RCT_XY8_UNDEFINED) continue; - LocationXYZ16 location = { (int16_t)(ride->station_starts[stationId].x * 32), - (int16_t)(ride->station_starts[stationId].y * 32), - (ride->station_heights[stationId]) }; + LocationXYZ16 location = { + (int16_t)(ride->station_starts[stationId].x * 32), + (int16_t)(ride->station_starts[stationId].y * 32), + (ride->station_heights[stationId]), + }; uint8_t direction = 0xFF; bool specialTrack = false; @@ -8241,13 +8260,13 @@ void sub_6CB945(int32_t rideIndex) if (!ride_get_entrance_location(ride, stationId).isNull()) break; - ride_set_entrance_location( - ride, - stationId, - { location.x / 32, - location.y / 32, - ride->station_heights[stationId], - (uint8_t)tile_element_get_direction(tileElement) }); + TileCoordsXYZD entranceLocation = { + location.x / 32, + location.y / 32, + ride->station_heights[stationId], + (uint8_t)tile_element_get_direction(tileElement), + }; + ride_set_entrance_location(ride, stationId, entranceLocation); } tileElement->properties.entrance.index &= 0x8F; @@ -8919,10 +8938,13 @@ void determine_ride_entrance_and_exit_locations() } // Found our entrance - ride_set_entrance_location( - ride, - stationIndex, - { x, y, tileElement->base_height, (uint8_t)tile_element_get_direction(tileElement) }); + TileCoordsXYZD newEntranceLoc = { + x, + y, + tileElement->base_height, + (uint8_t)tile_element_get_direction(tileElement), + }; + ride_set_entrance_location(ride, stationIndex, newEntranceLoc); alreadyFoundEntrance = true; log_verbose( diff --git a/src/openrct2/ride/RideGroupManager.cpp b/src/openrct2/ride/RideGroupManager.cpp index eeb470873d..ffc89f32c6 100644 --- a/src/openrct2/ride/RideGroupManager.cpp +++ b/src/openrct2/ride/RideGroupManager.cpp @@ -139,16 +139,26 @@ static constexpr const RideGroup ride_group_spinning_wild_mouse = { /*.Flags =*/0, }; -static constexpr const RideGroup corkscrew_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] - = { ride_group_corkscrew_rc, ride_group_hypercoaster }; -static constexpr const RideGroup junior_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] - = { ride_group_junior_rc, ride_group_classic_mini_coaster }; -static constexpr const RideGroup car_ride_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] - = { ride_group_car_ride, ride_group_monster_trucks }; -static constexpr const RideGroup twister_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] - = { ride_group_steel_twister_rc, ride_group_hyper_twister }; -static constexpr const RideGroup steel_wild_mouse_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] - = { ride_group_steel_wild_mouse, ride_group_spinning_wild_mouse }; +static constexpr const RideGroup corkscrew_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { + ride_group_corkscrew_rc, + ride_group_hypercoaster, +}; +static constexpr const RideGroup junior_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { + ride_group_junior_rc, + ride_group_classic_mini_coaster, +}; +static constexpr const RideGroup car_ride_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { + ride_group_car_ride, + ride_group_monster_trucks, +}; +static constexpr const RideGroup twister_rc_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { + ride_group_steel_twister_rc, + ride_group_hyper_twister, +}; +static constexpr const RideGroup steel_wild_mouse_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = { + ride_group_steel_wild_mouse, + ride_group_spinning_wild_mouse, +}; bool RideGroup::Equals(const RideGroup* otherRideGroup) const { diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 7871fcb797..04dec6ce7c 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -225,9 +225,11 @@ static void ride_ratings_update_state_2() ride_ratings_score_close_proximity(tileElement); - CoordsXYE trackElement = { /* .x = */ gRideRatingsCalcData.proximity_x, - /* .y = */ gRideRatingsCalcData.proximity_y, - /* .element = */ tileElement }; + CoordsXYE trackElement = { + /* .x = */ gRideRatingsCalcData.proximity_x, + /* .y = */ gRideRatingsCalcData.proximity_y, + /* .element = */ tileElement, + }; CoordsXYE nextTrackElement; if (!track_block_get_next(&trackElement, &nextTrackElement, NULL, NULL)) { @@ -1315,9 +1317,11 @@ static rating_tuple ride_ratings_get_sheltered_ratings(Ride* ride) */ static rating_tuple ride_ratings_get_gforce_ratings(Ride* ride) { - rating_tuple result = { /* .excitement = */ 0, - /* .intensity = */ 0, - /* .nausea = */ 0 }; + rating_tuple result = { + /* .excitement = */ 0, + /* .intensity = */ 0, + /* .nausea = */ 0, + }; // Apply maximum positive G force factor result.excitement += (ride->max_positive_vertical_g * 5242) >> 16; @@ -1359,9 +1363,11 @@ static rating_tuple ride_ratings_get_gforce_ratings(Ride* ride) */ static rating_tuple ride_ratings_get_drop_ratings(Ride* ride) { - rating_tuple result = { /* .excitement = */ 0, - /* .intensity = */ 0, - /* .nausea = */ 0 }; + rating_tuple result = { + /* .excitement = */ 0, + /* .intensity = */ 0, + /* .nausea = */ 0, + }; // Apply number of drops factor int32_t drops = ride->drops & 0x3F; @@ -3114,9 +3120,11 @@ static void ride_ratings_calculate_haunted_house(Ride* ride) ride->unreliability_factor = 8; set_unreliability_factor(ride); - rating_tuple ratings = { /* .excitement = */ RIDE_RATING(3, 41), - /* .intensity = */ RIDE_RATING(1, 53), - /* .nausea = */ RIDE_RATING(0, 10) }; + rating_tuple ratings = { + /* .excitement = */ RIDE_RATING(3, 41), + /* .intensity = */ RIDE_RATING(1, 53), + /* .nausea = */ RIDE_RATING(0, 10), + }; ride_ratings_apply_intensity_penalty(&ratings); ride_ratings_apply_adjustments(ride, &ratings); @@ -3511,9 +3519,11 @@ static void ride_ratings_calculate_circus_show(Ride* ride) ride->unreliability_factor = 9; set_unreliability_factor(ride); - rating_tuple ratings = { /* .excitement = */ RIDE_RATING(2, 10), - /* .intensity = */ RIDE_RATING(0, 30), - /* .nausea = */ RIDE_RATING(0, 0) }; + rating_tuple ratings = { + /* .excitement = */ RIDE_RATING(2, 10), + /* .intensity = */ RIDE_RATING(0, 30), + /* .nausea = */ RIDE_RATING(0, 0), + }; ride_ratings_apply_intensity_penalty(&ratings); ride_ratings_apply_adjustments(ride, &ratings); @@ -3859,9 +3869,11 @@ static void ride_ratings_calculate_flying_saucers(Ride* ride) ride->unreliability_factor = 32; set_unreliability_factor(ride); - rating_tuple ratings = { /* .excitement = */ RIDE_RATING(2, 40), - /* .intensity = */ RIDE_RATING(0, 55), - /* .nausea = */ RIDE_RATING(0, 39) }; + rating_tuple ratings = { + /* .excitement = */ RIDE_RATING(2, 40), + /* .intensity = */ RIDE_RATING(0, 55), + /* .nausea = */ RIDE_RATING(0, 39), + }; if (ride->num_vehicles >= 4) { @@ -3896,9 +3908,11 @@ static void ride_ratings_calculate_crooked_house(Ride* ride) ride->unreliability_factor = 5; set_unreliability_factor(ride); - rating_tuple ratings = { /* .excitement = */ RIDE_RATING(2, 15), - /* .intensity = */ RIDE_RATING(0, 62), - /* .nausea = */ RIDE_RATING(0, 34) }; + rating_tuple ratings = { + /* .excitement = */ RIDE_RATING(2, 15), + /* .intensity = */ RIDE_RATING(0, 62), + /* .nausea = */ RIDE_RATING(0, 34), + }; ride_ratings_apply_intensity_penalty(&ratings); ride_ratings_apply_adjustments(ride, &ratings); @@ -4197,9 +4211,11 @@ static void ride_ratings_calculate_enterprise(Ride* ride) set_unreliability_factor(ride); // Base ratings - rating_tuple ratings = { /* .excitement = */ RIDE_RATING(3, 60), - /* .intensity = */ RIDE_RATING(4, 55), - /* .nausea = */ RIDE_RATING(5, 72) }; + rating_tuple ratings = { + /* .excitement = */ RIDE_RATING(3, 60), + /* .intensity = */ RIDE_RATING(4, 55), + /* .nausea = */ RIDE_RATING(5, 72), + }; ride_ratings_add(&ratings, ride->operation_option, ride->operation_option * 16, ride->operation_option * 16); diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp index b961b8355c..b317066dca 100644 --- a/src/openrct2/ride/ShopItem.cpp +++ b/src/openrct2/ride/ShopItem.cpp @@ -134,262 +134,65 @@ const money8 DefaultShopItemPrice[SHOP_ITEM_COUNT] = { MONEY(0, 00), // 55 }; -const rct_shop_item_string_types ShopItemStringIds[SHOP_ITEM_COUNT] = { - { STR_SHOP_ITEM_PRICE_LABEL_BALLOON, - STR_SHOP_ITEM_SINGULAR_BALLOON, - STR_SHOP_ITEM_PLURAL_BALLOON, - STR_SHOP_ITEM_INDEFINITE_BALLOON, - STR_SHOP_ITEM_DISPLAY_BALLOON }, - { STR_SHOP_ITEM_PRICE_LABEL_CUDDLY_TOY, - STR_SHOP_ITEM_SINGULAR_CUDDLY_TOY, - STR_SHOP_ITEM_PLURAL_CUDDLY_TOY, - STR_SHOP_ITEM_INDEFINITE_CUDDLY_TOY, - STR_SHOP_ITEM_DISPLAY_CUDDLY_TOY }, - { STR_SHOP_ITEM_PRICE_LABEL_PARK_MAP, - STR_SHOP_ITEM_SINGULAR_PARK_MAP, - STR_SHOP_ITEM_PLURAL_PARK_MAP, - STR_SHOP_ITEM_INDEFINITE_PARK_MAP, - STR_SHOP_ITEM_DISPLAY_PARK_MAP }, - { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, - STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, - { STR_SHOP_ITEM_PRICE_LABEL_UMBRELLA, - STR_SHOP_ITEM_SINGULAR_UMBRELLA, - STR_SHOP_ITEM_PLURAL_UMBRELLA, - STR_SHOP_ITEM_INDEFINITE_UMBRELLA, - STR_SHOP_ITEM_DISPLAY_UMBRELLA }, - { STR_SHOP_ITEM_PRICE_LABEL_DRINK, - STR_SHOP_ITEM_SINGULAR_DRINK, - STR_SHOP_ITEM_PLURAL_DRINK, - STR_SHOP_ITEM_INDEFINITE_DRINK, - STR_SHOP_ITEM_DISPLAY_DRINK }, - { STR_SHOP_ITEM_PRICE_LABEL_BURGER, - STR_SHOP_ITEM_SINGULAR_BURGER, - STR_SHOP_ITEM_PLURAL_BURGER, - STR_SHOP_ITEM_INDEFINITE_BURGER, - STR_SHOP_ITEM_DISPLAY_BURGER }, - { STR_SHOP_ITEM_PRICE_LABEL_CHIPS, - STR_SHOP_ITEM_SINGULAR_CHIPS, - STR_SHOP_ITEM_PLURAL_CHIPS, - STR_SHOP_ITEM_INDEFINITE_CHIPS, - STR_SHOP_ITEM_DISPLAY_CHIPS }, - { STR_SHOP_ITEM_PRICE_LABEL_ICE_CREAM, - STR_SHOP_ITEM_SINGULAR_ICE_CREAM, - STR_SHOP_ITEM_PLURAL_ICE_CREAM, - STR_SHOP_ITEM_INDEFINITE_ICE_CREAM, - STR_SHOP_ITEM_DISPLAY_ICE_CREAM }, - { STR_SHOP_ITEM_PRICE_LABEL_CANDYFLOSS, - STR_SHOP_ITEM_SINGULAR_CANDYFLOSS, - STR_SHOP_ITEM_PLURAL_CANDYFLOSS, - STR_SHOP_ITEM_INDEFINITE_CANDYFLOSS, - STR_SHOP_ITEM_DISPLAY_CANDYFLOSS }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_CAN, - STR_SHOP_ITEM_SINGULAR_EMPTY_CAN, - STR_SHOP_ITEM_PLURAL_EMPTY_CAN, - STR_SHOP_ITEM_INDEFINITE_EMPTY_CAN, - STR_SHOP_ITEM_DISPLAY_EMPTY_CAN }, - { STR_SHOP_ITEM_PRICE_LABEL_RUBBISH, - STR_SHOP_ITEM_SINGULAR_RUBBISH, - STR_SHOP_ITEM_PLURAL_RUBBISH, - STR_SHOP_ITEM_INDEFINITE_RUBBISH, - STR_SHOP_ITEM_DISPLAY_RUBBISH }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BURGER_BOX, - STR_SHOP_ITEM_SINGULAR_EMPTY_BURGER_BOX, - STR_SHOP_ITEM_PLURAL_EMPTY_BURGER_BOX, - STR_SHOP_ITEM_INDEFINITE_EMPTY_BURGER_BOX, - STR_SHOP_ITEM_DISPLAY_EMPTY_BURGER_BOX }, - { STR_SHOP_ITEM_PRICE_LABEL_PIZZA, - STR_SHOP_ITEM_SINGULAR_PIZZA, - STR_SHOP_ITEM_PLURAL_PIZZA, - STR_SHOP_ITEM_INDEFINITE_PIZZA, - STR_SHOP_ITEM_DISPLAY_PIZZA }, - { STR_SHOP_ITEM_PRICE_LABEL_VOUCHER, - STR_SHOP_ITEM_SINGULAR_VOUCHER, - STR_SHOP_ITEM_PLURAL_VOUCHER, - STR_SHOP_ITEM_INDEFINITE_VOUCHER, - STR_SHOP_ITEM_DISPLAY_VOUCHER }, - { STR_SHOP_ITEM_PRICE_LABEL_POPCORN, - STR_SHOP_ITEM_SINGULAR_POPCORN, - STR_SHOP_ITEM_PLURAL_POPCORN, - STR_SHOP_ITEM_INDEFINITE_POPCORN, - STR_SHOP_ITEM_DISPLAY_POPCORN }, - { STR_SHOP_ITEM_PRICE_LABEL_HOT_DOG, - STR_SHOP_ITEM_SINGULAR_HOT_DOG, - STR_SHOP_ITEM_PLURAL_HOT_DOG, - STR_SHOP_ITEM_INDEFINITE_HOT_DOG, - STR_SHOP_ITEM_DISPLAY_HOT_DOG }, - { STR_SHOP_ITEM_PRICE_LABEL_TENTACLE, - STR_SHOP_ITEM_SINGULAR_TENTACLE, - STR_SHOP_ITEM_PLURAL_TENTACLE, - STR_SHOP_ITEM_INDEFINITE_TENTACLE, - STR_SHOP_ITEM_DISPLAY_TENTACLE }, - { STR_SHOP_ITEM_PRICE_LABEL_HAT, - STR_SHOP_ITEM_SINGULAR_HAT, - STR_SHOP_ITEM_PLURAL_HAT, - STR_SHOP_ITEM_INDEFINITE_HAT, - STR_SHOP_ITEM_DISPLAY_HAT }, - { STR_SHOP_ITEM_PRICE_LABEL_TOFFEE_APPLE, - STR_SHOP_ITEM_SINGULAR_TOFFEE_APPLE, - STR_SHOP_ITEM_PLURAL_TOFFEE_APPLE, - STR_SHOP_ITEM_INDEFINITE_TOFFEE_APPLE, - STR_SHOP_ITEM_DISPLAY_TOFFEE_APPLE }, - { STR_SHOP_ITEM_PRICE_LABEL_T_SHIRT, - STR_SHOP_ITEM_SINGULAR_T_SHIRT, - STR_SHOP_ITEM_PLURAL_T_SHIRT, - STR_SHOP_ITEM_INDEFINITE_T_SHIRT, - STR_SHOP_ITEM_DISPLAY_T_SHIRT }, - { STR_SHOP_ITEM_PRICE_LABEL_DOUGHNUT, - STR_SHOP_ITEM_SINGULAR_DOUGHNUT, - STR_SHOP_ITEM_PLURAL_DOUGHNUT, - STR_SHOP_ITEM_INDEFINITE_DOUGHNUT, - STR_SHOP_ITEM_DISPLAY_DOUGHNUT }, - { STR_SHOP_ITEM_PRICE_LABEL_COFFEE, - STR_SHOP_ITEM_SINGULAR_COFFEE, - STR_SHOP_ITEM_PLURAL_COFFEE, - STR_SHOP_ITEM_INDEFINITE_COFFEE, - STR_SHOP_ITEM_DISPLAY_COFFEE }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_CUP, - STR_SHOP_ITEM_SINGULAR_EMPTY_CUP, - STR_SHOP_ITEM_PLURAL_EMPTY_CUP, - STR_SHOP_ITEM_INDEFINITE_EMPTY_CUP, - STR_SHOP_ITEM_DISPLAY_EMPTY_CUP }, - { STR_SHOP_ITEM_PRICE_LABEL_FRIED_CHICKEN, - STR_SHOP_ITEM_SINGULAR_FRIED_CHICKEN, - STR_SHOP_ITEM_PLURAL_FRIED_CHICKEN, - STR_SHOP_ITEM_INDEFINITE_FRIED_CHICKEN, - STR_SHOP_ITEM_DISPLAY_FRIED_CHICKEN }, - { STR_SHOP_ITEM_PRICE_LABEL_LEMONADE, - STR_SHOP_ITEM_SINGULAR_LEMONADE, - STR_SHOP_ITEM_PLURAL_LEMONADE, - STR_SHOP_ITEM_INDEFINITE_LEMONADE, - STR_SHOP_ITEM_DISPLAY_LEMONADE }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOX, - STR_SHOP_ITEM_SINGULAR_EMPTY_BOX, - STR_SHOP_ITEM_PLURAL_EMPTY_BOX, - STR_SHOP_ITEM_INDEFINITE_EMPTY_BOX, - STR_SHOP_ITEM_DISPLAY_EMPTY_BOX }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOTTLE, - STR_SHOP_ITEM_SINGULAR_EMPTY_BOTTLE, - STR_SHOP_ITEM_PLURAL_EMPTY_BOTTLE, - STR_SHOP_ITEM_INDEFINITE_EMPTY_BOTTLE, - STR_SHOP_ITEM_DISPLAY_EMPTY_BOTTLE }, - { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, - { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, - { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, - { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, - { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, - STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, - { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, - STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, - { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, - STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, - STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, - STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, - { STR_SHOP_ITEM_PRICE_LABEL_PRETZEL, - STR_SHOP_ITEM_SINGULAR_PRETZEL, - STR_SHOP_ITEM_PLURAL_PRETZEL, - STR_SHOP_ITEM_INDEFINITE_PRETZEL, - STR_SHOP_ITEM_DISPLAY_PRETZEL }, - { STR_SHOP_ITEM_PRICE_LABEL_HOT_CHOCOLATE, - STR_SHOP_ITEM_SINGULAR_HOT_CHOCOLATE, - STR_SHOP_ITEM_PLURAL_HOT_CHOCOLATE, - STR_SHOP_ITEM_INDEFINITE_HOT_CHOCOLATE, - STR_SHOP_ITEM_DISPLAY_HOT_CHOCOLATE }, - { STR_SHOP_ITEM_PRICE_LABEL_ICED_TEA, - STR_SHOP_ITEM_SINGULAR_ICED_TEA, - STR_SHOP_ITEM_PLURAL_ICED_TEA, - STR_SHOP_ITEM_INDEFINITE_ICED_TEA, - STR_SHOP_ITEM_DISPLAY_ICED_TEA }, - { STR_SHOP_ITEM_PRICE_LABEL_FUNNEL_CAKE, - STR_SHOP_ITEM_SINGULAR_FUNNEL_CAKE, - STR_SHOP_ITEM_PLURAL_FUNNEL_CAKE, - STR_SHOP_ITEM_INDEFINITE_FUNNEL_CAKE, - STR_SHOP_ITEM_DISPLAY_FUNNEL_CAKE }, - { STR_SHOP_ITEM_PRICE_LABEL_SUNGLASSES, - STR_SHOP_ITEM_SINGULAR_SUNGLASSES, - STR_SHOP_ITEM_PLURAL_SUNGLASSES, - STR_SHOP_ITEM_INDEFINITE_SUNGLASSES, - STR_SHOP_ITEM_DISPLAY_SUNGLASSES }, - { STR_SHOP_ITEM_PRICE_LABEL_BEEF_NOODLES, - STR_SHOP_ITEM_SINGULAR_BEEF_NOODLES, - STR_SHOP_ITEM_PLURAL_BEEF_NOODLES, - STR_SHOP_ITEM_INDEFINITE_BEEF_NOODLES, - STR_SHOP_ITEM_DISPLAY_BEEF_NOODLES }, - { STR_SHOP_ITEM_PRICE_LABEL_FRIED_RICE_NOODLES, - STR_SHOP_ITEM_SINGULAR_FRIED_RICE_NOODLES, - STR_SHOP_ITEM_PLURAL_FRIED_RICE_NOODLES, - STR_SHOP_ITEM_INDEFINITE_FRIED_RICE_NOODLES, - STR_SHOP_ITEM_DISPLAY_FRIED_RICE_NOODLES }, - { STR_SHOP_ITEM_PRICE_LABEL_WONTON_SOUP, - STR_SHOP_ITEM_SINGULAR_WONTON_SOUP, - STR_SHOP_ITEM_PLURAL_WONTON_SOUP, - STR_SHOP_ITEM_INDEFINITE_WONTON_SOUP, - STR_SHOP_ITEM_DISPLAY_WONTON_SOUP }, - { STR_SHOP_ITEM_PRICE_LABEL_MEATBALL_SOUP, - STR_SHOP_ITEM_SINGULAR_MEATBALL_SOUP, - STR_SHOP_ITEM_PLURAL_MEATBALL_SOUP, - STR_SHOP_ITEM_INDEFINITE_MEATBALL_SOUP, - STR_SHOP_ITEM_DISPLAY_MEATBALL_SOUP }, - { STR_SHOP_ITEM_PRICE_LABEL_FRUIT_JUICE, - STR_SHOP_ITEM_SINGULAR_FRUIT_JUICE, - STR_SHOP_ITEM_PLURAL_FRUIT_JUICE, - STR_SHOP_ITEM_INDEFINITE_FRUIT_JUICE, - STR_SHOP_ITEM_DISPLAY_FRUIT_JUICE }, - { STR_SHOP_ITEM_PRICE_LABEL_SOYBEAN_MILK, - STR_SHOP_ITEM_SINGULAR_SOYBEAN_MILK, - STR_SHOP_ITEM_PLURAL_SOYBEAN_MILK, - STR_SHOP_ITEM_INDEFINITE_SOYBEAN_MILK, - STR_SHOP_ITEM_DISPLAY_SOYBEAN_MILK }, - { STR_SHOP_ITEM_PRICE_LABEL_SUJONGKWA, - STR_SHOP_ITEM_SINGULAR_SUJONGKWA, - STR_SHOP_ITEM_PLURAL_SUJONGKWA, - STR_SHOP_ITEM_INDEFINITE_SUJONGKWA, - STR_SHOP_ITEM_DISPLAY_SUJONGKWA }, - { STR_SHOP_ITEM_PRICE_LABEL_SUB_SANDWICH, - STR_SHOP_ITEM_SINGULAR_SUB_SANDWICH, - STR_SHOP_ITEM_PLURAL_SUB_SANDWICH, - STR_SHOP_ITEM_INDEFINITE_SUB_SANDWICH, - STR_SHOP_ITEM_DISPLAY_SUB_SANDWICH }, - { STR_SHOP_ITEM_PRICE_LABEL_COOKIE, - STR_SHOP_ITEM_SINGULAR_COOKIE, - STR_SHOP_ITEM_PLURAL_COOKIE, - STR_SHOP_ITEM_INDEFINITE_COOKIE, - STR_SHOP_ITEM_DISPLAY_COOKIE }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOWL_RED, - STR_SHOP_ITEM_SINGULAR_EMPTY_BOWL_RED, - STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_RED, - STR_SHOP_ITEM_INDEFINITE_EMPTY_BOWL_RED, - STR_SHOP_ITEM_DISPLAY_EMPTY_BOWL_RED }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_DRINK_CARTON, - STR_SHOP_ITEM_SINGULAR_EMPTY_DRINK_CARTON, - STR_SHOP_ITEM_PLURAL_EMPTY_DRINK_CARTON, - STR_SHOP_ITEM_INDEFINITE_EMPTY_DRINK_CARTON, - STR_SHOP_ITEM_DISPLAY_EMPTY_DRINK_CARTON }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_JUICE_CUP, - STR_SHOP_ITEM_SINGULAR_EMPTY_JUICE_CUP, - STR_SHOP_ITEM_PLURAL_EMPTY_JUICE_CUP, - STR_SHOP_ITEM_INDEFINITE_EMPTY_JUICE_CUP, - STR_SHOP_ITEM_DISPLAY_EMPTY_JUICE_CUP }, - { STR_SHOP_ITEM_PRICE_LABEL_ROAST_SAUSAGE, - STR_SHOP_ITEM_SINGULAR_ROAST_SAUSAGE, - STR_SHOP_ITEM_PLURAL_ROAST_SAUSAGE, - STR_SHOP_ITEM_INDEFINITE_ROAST_SAUSAGE, - STR_SHOP_ITEM_DISPLAY_ROAST_SAUSAGE }, - { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOWL_BLUE, - STR_SHOP_ITEM_SINGULAR_EMPTY_BOWL_BLUE, - STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_BLUE, - STR_SHOP_ITEM_INDEFINITE_EMPTY_BOWL_BLUE, - STR_SHOP_ITEM_DISPLAY_EMPTY_BOWL_BLUE }, +// clang-format off +const rct_shop_item_string_types ShopItemStringIds[SHOP_ITEM_COUNT] = +{ + { STR_SHOP_ITEM_PRICE_LABEL_BALLOON, STR_SHOP_ITEM_SINGULAR_BALLOON, STR_SHOP_ITEM_PLURAL_BALLOON, STR_SHOP_ITEM_INDEFINITE_BALLOON, STR_SHOP_ITEM_DISPLAY_BALLOON }, + { STR_SHOP_ITEM_PRICE_LABEL_CUDDLY_TOY, STR_SHOP_ITEM_SINGULAR_CUDDLY_TOY, STR_SHOP_ITEM_PLURAL_CUDDLY_TOY, STR_SHOP_ITEM_INDEFINITE_CUDDLY_TOY, STR_SHOP_ITEM_DISPLAY_CUDDLY_TOY }, + { STR_SHOP_ITEM_PRICE_LABEL_PARK_MAP, STR_SHOP_ITEM_SINGULAR_PARK_MAP, STR_SHOP_ITEM_PLURAL_PARK_MAP, STR_SHOP_ITEM_INDEFINITE_PARK_MAP, STR_SHOP_ITEM_DISPLAY_PARK_MAP }, + { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, + { STR_SHOP_ITEM_PRICE_LABEL_UMBRELLA, STR_SHOP_ITEM_SINGULAR_UMBRELLA, STR_SHOP_ITEM_PLURAL_UMBRELLA, STR_SHOP_ITEM_INDEFINITE_UMBRELLA, STR_SHOP_ITEM_DISPLAY_UMBRELLA }, + { STR_SHOP_ITEM_PRICE_LABEL_DRINK, STR_SHOP_ITEM_SINGULAR_DRINK, STR_SHOP_ITEM_PLURAL_DRINK, STR_SHOP_ITEM_INDEFINITE_DRINK, STR_SHOP_ITEM_DISPLAY_DRINK }, + { STR_SHOP_ITEM_PRICE_LABEL_BURGER, STR_SHOP_ITEM_SINGULAR_BURGER, STR_SHOP_ITEM_PLURAL_BURGER, STR_SHOP_ITEM_INDEFINITE_BURGER, STR_SHOP_ITEM_DISPLAY_BURGER }, + { STR_SHOP_ITEM_PRICE_LABEL_CHIPS, STR_SHOP_ITEM_SINGULAR_CHIPS, STR_SHOP_ITEM_PLURAL_CHIPS, STR_SHOP_ITEM_INDEFINITE_CHIPS, STR_SHOP_ITEM_DISPLAY_CHIPS }, + { STR_SHOP_ITEM_PRICE_LABEL_ICE_CREAM, STR_SHOP_ITEM_SINGULAR_ICE_CREAM, STR_SHOP_ITEM_PLURAL_ICE_CREAM, STR_SHOP_ITEM_INDEFINITE_ICE_CREAM, STR_SHOP_ITEM_DISPLAY_ICE_CREAM }, + { STR_SHOP_ITEM_PRICE_LABEL_CANDYFLOSS, STR_SHOP_ITEM_SINGULAR_CANDYFLOSS, STR_SHOP_ITEM_PLURAL_CANDYFLOSS, STR_SHOP_ITEM_INDEFINITE_CANDYFLOSS, STR_SHOP_ITEM_DISPLAY_CANDYFLOSS }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_CAN, STR_SHOP_ITEM_SINGULAR_EMPTY_CAN, STR_SHOP_ITEM_PLURAL_EMPTY_CAN, STR_SHOP_ITEM_INDEFINITE_EMPTY_CAN, STR_SHOP_ITEM_DISPLAY_EMPTY_CAN }, + { STR_SHOP_ITEM_PRICE_LABEL_RUBBISH, STR_SHOP_ITEM_SINGULAR_RUBBISH, STR_SHOP_ITEM_PLURAL_RUBBISH, STR_SHOP_ITEM_INDEFINITE_RUBBISH, STR_SHOP_ITEM_DISPLAY_RUBBISH }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BURGER_BOX, STR_SHOP_ITEM_SINGULAR_EMPTY_BURGER_BOX, STR_SHOP_ITEM_PLURAL_EMPTY_BURGER_BOX, STR_SHOP_ITEM_INDEFINITE_EMPTY_BURGER_BOX, STR_SHOP_ITEM_DISPLAY_EMPTY_BURGER_BOX }, + { STR_SHOP_ITEM_PRICE_LABEL_PIZZA, STR_SHOP_ITEM_SINGULAR_PIZZA, STR_SHOP_ITEM_PLURAL_PIZZA, STR_SHOP_ITEM_INDEFINITE_PIZZA, STR_SHOP_ITEM_DISPLAY_PIZZA }, + { STR_SHOP_ITEM_PRICE_LABEL_VOUCHER, STR_SHOP_ITEM_SINGULAR_VOUCHER, STR_SHOP_ITEM_PLURAL_VOUCHER, STR_SHOP_ITEM_INDEFINITE_VOUCHER, STR_SHOP_ITEM_DISPLAY_VOUCHER }, + { STR_SHOP_ITEM_PRICE_LABEL_POPCORN, STR_SHOP_ITEM_SINGULAR_POPCORN, STR_SHOP_ITEM_PLURAL_POPCORN, STR_SHOP_ITEM_INDEFINITE_POPCORN, STR_SHOP_ITEM_DISPLAY_POPCORN }, + { STR_SHOP_ITEM_PRICE_LABEL_HOT_DOG, STR_SHOP_ITEM_SINGULAR_HOT_DOG, STR_SHOP_ITEM_PLURAL_HOT_DOG, STR_SHOP_ITEM_INDEFINITE_HOT_DOG, STR_SHOP_ITEM_DISPLAY_HOT_DOG }, + { STR_SHOP_ITEM_PRICE_LABEL_TENTACLE, STR_SHOP_ITEM_SINGULAR_TENTACLE, STR_SHOP_ITEM_PLURAL_TENTACLE, STR_SHOP_ITEM_INDEFINITE_TENTACLE, STR_SHOP_ITEM_DISPLAY_TENTACLE }, + { STR_SHOP_ITEM_PRICE_LABEL_HAT, STR_SHOP_ITEM_SINGULAR_HAT, STR_SHOP_ITEM_PLURAL_HAT, STR_SHOP_ITEM_INDEFINITE_HAT, STR_SHOP_ITEM_DISPLAY_HAT }, + { STR_SHOP_ITEM_PRICE_LABEL_TOFFEE_APPLE, STR_SHOP_ITEM_SINGULAR_TOFFEE_APPLE, STR_SHOP_ITEM_PLURAL_TOFFEE_APPLE, STR_SHOP_ITEM_INDEFINITE_TOFFEE_APPLE, STR_SHOP_ITEM_DISPLAY_TOFFEE_APPLE }, + { STR_SHOP_ITEM_PRICE_LABEL_T_SHIRT, STR_SHOP_ITEM_SINGULAR_T_SHIRT, STR_SHOP_ITEM_PLURAL_T_SHIRT, STR_SHOP_ITEM_INDEFINITE_T_SHIRT, STR_SHOP_ITEM_DISPLAY_T_SHIRT }, + { STR_SHOP_ITEM_PRICE_LABEL_DOUGHNUT, STR_SHOP_ITEM_SINGULAR_DOUGHNUT, STR_SHOP_ITEM_PLURAL_DOUGHNUT, STR_SHOP_ITEM_INDEFINITE_DOUGHNUT, STR_SHOP_ITEM_DISPLAY_DOUGHNUT }, + { STR_SHOP_ITEM_PRICE_LABEL_COFFEE, STR_SHOP_ITEM_SINGULAR_COFFEE, STR_SHOP_ITEM_PLURAL_COFFEE, STR_SHOP_ITEM_INDEFINITE_COFFEE, STR_SHOP_ITEM_DISPLAY_COFFEE }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_CUP, STR_SHOP_ITEM_SINGULAR_EMPTY_CUP, STR_SHOP_ITEM_PLURAL_EMPTY_CUP, STR_SHOP_ITEM_INDEFINITE_EMPTY_CUP, STR_SHOP_ITEM_DISPLAY_EMPTY_CUP }, + { STR_SHOP_ITEM_PRICE_LABEL_FRIED_CHICKEN, STR_SHOP_ITEM_SINGULAR_FRIED_CHICKEN, STR_SHOP_ITEM_PLURAL_FRIED_CHICKEN, STR_SHOP_ITEM_INDEFINITE_FRIED_CHICKEN, STR_SHOP_ITEM_DISPLAY_FRIED_CHICKEN }, + { STR_SHOP_ITEM_PRICE_LABEL_LEMONADE, STR_SHOP_ITEM_SINGULAR_LEMONADE, STR_SHOP_ITEM_PLURAL_LEMONADE, STR_SHOP_ITEM_INDEFINITE_LEMONADE, STR_SHOP_ITEM_DISPLAY_LEMONADE }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOX, STR_SHOP_ITEM_SINGULAR_EMPTY_BOX, STR_SHOP_ITEM_PLURAL_EMPTY_BOX, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOX, STR_SHOP_ITEM_DISPLAY_EMPTY_BOX }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOTTLE, STR_SHOP_ITEM_SINGULAR_EMPTY_BOTTLE, STR_SHOP_ITEM_PLURAL_EMPTY_BOTTLE, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOTTLE, STR_SHOP_ITEM_DISPLAY_EMPTY_BOTTLE }, + { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, + { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, + { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, + { STR_NONE, STR_NONE, STR_NONE, STR_NONE, STR_NONE }, + { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, + { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, + { STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO, STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO, STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO, STR_SHOP_ITEM_INDEFINITE_ON_RIDE_PHOTO, STR_SHOP_ITEM_DISPLAY_ON_RIDE_PHOTO }, + { STR_SHOP_ITEM_PRICE_LABEL_PRETZEL, STR_SHOP_ITEM_SINGULAR_PRETZEL, STR_SHOP_ITEM_PLURAL_PRETZEL, STR_SHOP_ITEM_INDEFINITE_PRETZEL, STR_SHOP_ITEM_DISPLAY_PRETZEL }, + { STR_SHOP_ITEM_PRICE_LABEL_HOT_CHOCOLATE, STR_SHOP_ITEM_SINGULAR_HOT_CHOCOLATE, STR_SHOP_ITEM_PLURAL_HOT_CHOCOLATE, STR_SHOP_ITEM_INDEFINITE_HOT_CHOCOLATE, STR_SHOP_ITEM_DISPLAY_HOT_CHOCOLATE }, + { STR_SHOP_ITEM_PRICE_LABEL_ICED_TEA, STR_SHOP_ITEM_SINGULAR_ICED_TEA, STR_SHOP_ITEM_PLURAL_ICED_TEA, STR_SHOP_ITEM_INDEFINITE_ICED_TEA, STR_SHOP_ITEM_DISPLAY_ICED_TEA }, + { STR_SHOP_ITEM_PRICE_LABEL_FUNNEL_CAKE, STR_SHOP_ITEM_SINGULAR_FUNNEL_CAKE, STR_SHOP_ITEM_PLURAL_FUNNEL_CAKE, STR_SHOP_ITEM_INDEFINITE_FUNNEL_CAKE, STR_SHOP_ITEM_DISPLAY_FUNNEL_CAKE }, + { STR_SHOP_ITEM_PRICE_LABEL_SUNGLASSES, STR_SHOP_ITEM_SINGULAR_SUNGLASSES, STR_SHOP_ITEM_PLURAL_SUNGLASSES, STR_SHOP_ITEM_INDEFINITE_SUNGLASSES, STR_SHOP_ITEM_DISPLAY_SUNGLASSES }, + { STR_SHOP_ITEM_PRICE_LABEL_BEEF_NOODLES, STR_SHOP_ITEM_SINGULAR_BEEF_NOODLES, STR_SHOP_ITEM_PLURAL_BEEF_NOODLES, STR_SHOP_ITEM_INDEFINITE_BEEF_NOODLES, STR_SHOP_ITEM_DISPLAY_BEEF_NOODLES }, + { STR_SHOP_ITEM_PRICE_LABEL_FRIED_RICE_NOODLES, STR_SHOP_ITEM_SINGULAR_FRIED_RICE_NOODLES, STR_SHOP_ITEM_PLURAL_FRIED_RICE_NOODLES, STR_SHOP_ITEM_INDEFINITE_FRIED_RICE_NOODLES, STR_SHOP_ITEM_DISPLAY_FRIED_RICE_NOODLES }, + { STR_SHOP_ITEM_PRICE_LABEL_WONTON_SOUP, STR_SHOP_ITEM_SINGULAR_WONTON_SOUP, STR_SHOP_ITEM_PLURAL_WONTON_SOUP, STR_SHOP_ITEM_INDEFINITE_WONTON_SOUP, STR_SHOP_ITEM_DISPLAY_WONTON_SOUP }, + { STR_SHOP_ITEM_PRICE_LABEL_MEATBALL_SOUP, STR_SHOP_ITEM_SINGULAR_MEATBALL_SOUP, STR_SHOP_ITEM_PLURAL_MEATBALL_SOUP, STR_SHOP_ITEM_INDEFINITE_MEATBALL_SOUP, STR_SHOP_ITEM_DISPLAY_MEATBALL_SOUP }, + { STR_SHOP_ITEM_PRICE_LABEL_FRUIT_JUICE, STR_SHOP_ITEM_SINGULAR_FRUIT_JUICE, STR_SHOP_ITEM_PLURAL_FRUIT_JUICE, STR_SHOP_ITEM_INDEFINITE_FRUIT_JUICE, STR_SHOP_ITEM_DISPLAY_FRUIT_JUICE }, + { STR_SHOP_ITEM_PRICE_LABEL_SOYBEAN_MILK, STR_SHOP_ITEM_SINGULAR_SOYBEAN_MILK, STR_SHOP_ITEM_PLURAL_SOYBEAN_MILK, STR_SHOP_ITEM_INDEFINITE_SOYBEAN_MILK, STR_SHOP_ITEM_DISPLAY_SOYBEAN_MILK }, + { STR_SHOP_ITEM_PRICE_LABEL_SUJONGKWA, STR_SHOP_ITEM_SINGULAR_SUJONGKWA, STR_SHOP_ITEM_PLURAL_SUJONGKWA, STR_SHOP_ITEM_INDEFINITE_SUJONGKWA, STR_SHOP_ITEM_DISPLAY_SUJONGKWA }, + { STR_SHOP_ITEM_PRICE_LABEL_SUB_SANDWICH, STR_SHOP_ITEM_SINGULAR_SUB_SANDWICH, STR_SHOP_ITEM_PLURAL_SUB_SANDWICH, STR_SHOP_ITEM_INDEFINITE_SUB_SANDWICH, STR_SHOP_ITEM_DISPLAY_SUB_SANDWICH }, + { STR_SHOP_ITEM_PRICE_LABEL_COOKIE, STR_SHOP_ITEM_SINGULAR_COOKIE, STR_SHOP_ITEM_PLURAL_COOKIE, STR_SHOP_ITEM_INDEFINITE_COOKIE, STR_SHOP_ITEM_DISPLAY_COOKIE }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOWL_RED, STR_SHOP_ITEM_SINGULAR_EMPTY_BOWL_RED, STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_RED, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOWL_RED, STR_SHOP_ITEM_DISPLAY_EMPTY_BOWL_RED }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_DRINK_CARTON, STR_SHOP_ITEM_SINGULAR_EMPTY_DRINK_CARTON, STR_SHOP_ITEM_PLURAL_EMPTY_DRINK_CARTON, STR_SHOP_ITEM_INDEFINITE_EMPTY_DRINK_CARTON, STR_SHOP_ITEM_DISPLAY_EMPTY_DRINK_CARTON }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_JUICE_CUP, STR_SHOP_ITEM_SINGULAR_EMPTY_JUICE_CUP, STR_SHOP_ITEM_PLURAL_EMPTY_JUICE_CUP, STR_SHOP_ITEM_INDEFINITE_EMPTY_JUICE_CUP, STR_SHOP_ITEM_DISPLAY_EMPTY_JUICE_CUP }, + { STR_SHOP_ITEM_PRICE_LABEL_ROAST_SAUSAGE, STR_SHOP_ITEM_SINGULAR_ROAST_SAUSAGE, STR_SHOP_ITEM_PLURAL_ROAST_SAUSAGE, STR_SHOP_ITEM_INDEFINITE_ROAST_SAUSAGE, STR_SHOP_ITEM_DISPLAY_ROAST_SAUSAGE }, + { STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOWL_BLUE, STR_SHOP_ITEM_SINGULAR_EMPTY_BOWL_BLUE, STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_BLUE, STR_SHOP_ITEM_INDEFINITE_EMPTY_BOWL_BLUE, STR_SHOP_ITEM_DISPLAY_EMPTY_BOWL_BLUE }, }; +// clang-format on const uint32_t ShopItemImage[SHOP_ITEM_COUNT] = { SPR_SHOP_ITEM_BALLOON, diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 11167b14e8..0d7d524e7b 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -607,7 +607,9 @@ static void track_design_mirror_ride(rct_track_td6* td6) } /** rct2: 0x00993EDC */ -static constexpr const uint8_t maze_segment_mirror_map[] = { 5, 4, 2, 7, 1, 0, 14, 3, 13, 12, 10, 15, 9, 8, 6, 11 }; +static constexpr const uint8_t maze_segment_mirror_map[] = { + 5, 4, 2, 7, 1, 0, 14, 3, 13, 12, 10, 15, 9, 8, 6, 11, +}; /** * @@ -1591,8 +1593,10 @@ static bool track_design_place_ride(rct_track_td6* td6, int16_t x, int16_t y, in if (_trackDesignPlaceOperation != PTD_OPERATION_1) { - LocationXY16 tile - = { (int16_t)(x + CoordsDirectionDelta[rotation].x), (int16_t)(y + CoordsDirectionDelta[rotation].y) }; + LocationXY16 tile = { + (int16_t)(x + CoordsDirectionDelta[rotation].x), + (int16_t)(y + CoordsDirectionDelta[rotation].y), + }; rct_tile_element* tile_element = map_get_first_element_at(tile.x >> 5, tile.y >> 5); z = gTrackPreviewOrigin.z / 8; z += (entrance->z == (int8_t)(uint8_t)0x80) ? -1 : entrance->z; diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 0c82931711..117dc59073 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -68,9 +68,11 @@ public: VERSION, env.GetFilePath(PATHID::CACHE_TRACKS), std::string(PATTERN), - std::vector({ env.GetDirectoryPath(DIRBASE::RCT1, DIRID::TRACK), - env.GetDirectoryPath(DIRBASE::RCT2, DIRID::TRACK), - env.GetDirectoryPath(DIRBASE::USER, DIRID::TRACK) })) + std::vector({ + env.GetDirectoryPath(DIRBASE::RCT1, DIRID::TRACK), + env.GetDirectoryPath(DIRBASE::RCT2, DIRID::TRACK), + env.GetDirectoryPath(DIRBASE::USER, DIRID::TRACK), + })) { } diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 1b1dbba684..0b46d48a26 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -1469,7 +1469,9 @@ void track_paint_util_diag_tiles_paint( height + boundsOffset.z); } -const uint8_t mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[] = { 6, 4, 5, 3, 1, 2, 0 }; +const uint8_t mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[] = { + 6, 4, 5, 3, 1, 2, 0, +}; const LocationXY16 defaultRightQuarterTurn5TilesOffsets[4][5] = { { @@ -1564,7 +1566,10 @@ const LocationXY16 defaultRightQuarterTurn5TilesBoundLengths[4][5] = { }, }; -static constexpr const int8_t right_quarter_turn_5_tiles_sprite_map[] = { 0, -1, 1, 2, -1, 3, 4 }; +static constexpr const int8_t right_quarter_turn_5_tiles_sprite_map[] = { + 0, -1, 1, 2, -1, 3, 4, +}; + void track_paint_util_right_quarter_turn_5_tiles_paint( paint_session* session, int8_t thickness, @@ -1697,7 +1702,12 @@ void track_paint_util_right_quarter_turn_5_tiles_wooden_supports( } } -const uint8_t mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[] = { 3, 1, 2, 0 }; +const uint8_t mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[] = { + 3, + 1, + 2, + 0, +}; const LocationXY16 defaultRightQuarterTurn3TilesOffsets[4][3] = { { @@ -1768,7 +1778,13 @@ const LocationXY16 defaultRightQuarterTurn3TilesBoundLengths[4][3] = { }, }; -static constexpr const int8_t right_quarter_turn_3_tiles_sprite_map[] = { 0, -1, 1, 2 }; +static constexpr const int8_t right_quarter_turn_3_tiles_sprite_map[] = { + 0, + -1, + 1, + 2, +}; + void track_paint_util_right_quarter_turn_3_tiles_paint( paint_session* session, int8_t thickness, @@ -2023,7 +2039,13 @@ void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel( } } -static constexpr const int8_t left_quarter_turn_3_tiles_sprite_map[] = { 2, -1, 1, 0 }; +static constexpr const int8_t left_quarter_turn_3_tiles_sprite_map[] = { + 2, + -1, + 1, + 0, +}; + void track_paint_util_left_quarter_turn_3_tiles_paint( paint_session* session, int8_t thickness, diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index ebe9204e0b..6b8d595376 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -4603,8 +4603,10 @@ static void vehicle_update_boat_location(rct_vehicle* vehicle) LocationXY8 returnPosition = ride->boat_hire_return_position; uint8_t returnDirection = ride->boat_hire_return_direction & 3; - LocationXY8 location = { static_cast((vehicle->x + CoordsDirectionDelta[returnDirection].x) / 32), - static_cast((vehicle->y + CoordsDirectionDelta[returnDirection].y) / 32) }; + LocationXY8 location = { + static_cast((vehicle->x + CoordsDirectionDelta[returnDirection].x) / 32), + static_cast((vehicle->y + CoordsDirectionDelta[returnDirection].y) / 32), + }; if (location.xy == returnPosition.xy) { @@ -4621,9 +4623,10 @@ static void vehicle_update_boat_location(rct_vehicle* vehicle) { if (scenario_rand() & 1) { - LocationXY16 destLocation - = { static_cast(returnPosition.x * 32 - CoordsDirectionDelta[returnDirection].x + 16), - static_cast(returnPosition.y * 32 - CoordsDirectionDelta[returnDirection].y + 16) }; + LocationXY16 destLocation = { + static_cast(returnPosition.x * 32 - CoordsDirectionDelta[returnDirection].x + 16), + static_cast(returnPosition.y * 32 - CoordsDirectionDelta[returnDirection].y + 16), + }; destLocation.x -= vehicle->x; destLocation.y -= vehicle->y; diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index a84a131929..734d5d3134 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -137,9 +137,11 @@ public: VERSION, env.GetFilePath(PATHID::CACHE_SCENARIOS), std::string(PATTERN), - std::vector({ env.GetDirectoryPath(DIRBASE::RCT1, DIRID::SCENARIO), - env.GetDirectoryPath(DIRBASE::RCT2, DIRID::SCENARIO), - env.GetDirectoryPath(DIRBASE::USER, DIRID::SCENARIO) })) + std::vector({ + env.GetDirectoryPath(DIRBASE::RCT1, DIRID::SCENARIO), + env.GetDirectoryPath(DIRBASE::RCT2, DIRID::SCENARIO), + env.GetDirectoryPath(DIRBASE::USER, DIRID::SCENARIO), + })) { }