From 171271215e5fb20c049cde5b41faded72dfd6ff8 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 8 Dec 2017 07:59:44 +0100 Subject: [PATCH] Change some ride type names for clarity, fix Americanism --- data/language/en-GB.txt | 8 +-- src/openrct2-ui/windows/Map.cpp | 6 +- src/openrct2-ui/windows/NewRide.cpp | 6 +- src/openrct2-ui/windows/RideConstruction.cpp | 6 +- src/openrct2/localisation/localisation.c | 4 +- src/openrct2/localisation/string_ids.h | 4 +- src/openrct2/peep/Peep.cpp | 12 ++-- src/openrct2/peep/Peep.h | 8 +-- src/openrct2/rct1.h | 2 +- src/openrct2/rct1/Tables.cpp | 10 ++-- src/openrct2/ride/RideGroupManager.cpp | 16 +++--- src/openrct2/ride/Track.cpp | 2 +- src/openrct2/ride/TrackData.cpp | 12 ++-- src/openrct2/ride/TrackDataOld.cpp | 6 +- src/openrct2/ride/Vehicle.cpp | 2 +- src/openrct2/ride/ride.c | 12 ++-- src/openrct2/ride/ride.h | 8 +-- src/openrct2/ride/ride_data.c | 60 ++++++++++---------- src/openrct2/sprites.h | 2 +- test/tests/testdata/ratings/bpb.sv6.txt | 6 +- 20 files changed, 96 insertions(+), 96 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index ce3fa37072..f7176ab082 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -52,12 +52,12 @@ STR_0047 :Cash Machine STR_0048 :Twist STR_0049 :Haunted House STR_0050 :First Aid Room -STR_0051 :Circus Show +STR_0051 :Circus STR_0052 :Ghost Train -STR_0053 :Steel Twister Roller Coaster +STR_0053 :Twister Roller Coaster STR_0054 :Wooden Roller Coaster STR_0055 :Side-Friction Roller Coaster -STR_0056 :Wild Mouse +STR_0056 :Steel Wild Mouse STR_0057 :Multi-Dimension Roller Coaster STR_0058 :Unknown Ride (38) STR_0059 :Flying Roller Coaster @@ -1093,7 +1093,7 @@ STR_1087 :3D film: {ENDQUOTES}Space raiders{ENDQUOTES} STR_1088 :Intense mode STR_1089 :Berserk mode STR_1090 :Haunted house mode -STR_1091 :Circus show mode +STR_1091 :Circus mode STR_1092 :Downward launch STR_1093 :Crooked house mode STR_1094 :Freefall drop mode diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 6a806ad908..d0cfac1881 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -1509,7 +1509,7 @@ static const uint8 RideColourKey[] = { COLOUR_KEY_RIDE, // RIDE_TYPE_LOG_FLUME COLOUR_KEY_RIDE, // RIDE_TYPE_RIVER_RAPIDS COLOUR_KEY_RIDE, // RIDE_TYPE_DODGEMS - COLOUR_KEY_RIDE, // RIDE_TYPE_PIRATE_SHIP + COLOUR_KEY_RIDE, // RIDE_TYPE_SWINGING_SHIP COLOUR_KEY_RIDE, // RIDE_TYPE_SWINGING_INVERTER_SHIP COLOUR_KEY_FOOD, // RIDE_TYPE_FOOD_STALL COLOUR_KEY_FOOD, // RIDE_TYPE_1D @@ -1532,12 +1532,12 @@ static const uint8 RideColourKey[] = { COLOUR_KEY_RIDE, // RIDE_TYPE_TWIST COLOUR_KEY_RIDE, // RIDE_TYPE_HAUNTED_HOUSE COLOUR_KEY_FIRST_AID, // RIDE_TYPE_FIRST_AID - COLOUR_KEY_RIDE, // RIDE_TYPE_CIRCUS_SHOW + COLOUR_KEY_RIDE, // RIDE_TYPE_CIRCUS COLOUR_KEY_RIDE, // RIDE_TYPE_GHOST_TRAIN COLOUR_KEY_RIDE, // RIDE_TYPE_TWISTER_ROLLER_COASTER COLOUR_KEY_RIDE, // RIDE_TYPE_WOODEN_ROLLER_COASTER COLOUR_KEY_RIDE, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - COLOUR_KEY_RIDE, // RIDE_TYPE_WILD_MOUSE + COLOUR_KEY_RIDE, // RIDE_TYPE_STEEL_WILD_MOUSE COLOUR_KEY_RIDE, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER COLOUR_KEY_RIDE, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT COLOUR_KEY_RIDE, // RIDE_TYPE_FLYING_ROLLER_COASTER diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 432ea5d383..d90d599a3f 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -64,7 +64,7 @@ const char RideTypeViewOrder[] = { RIDE_TYPE_REVERSER_ROLLER_COASTER, RIDE_TYPE_WOODEN_ROLLER_COASTER, RIDE_TYPE_WOODEN_WILD_MOUSE, - RIDE_TYPE_WILD_MOUSE, + RIDE_TYPE_STEEL_WILD_MOUSE, RIDE_TYPE_INVERTED_HAIRPIN_COASTER, RIDE_TYPE_JUNIOR_ROLLER_COASTER, RIDE_TYPE_MINI_ROLLER_COASTER, @@ -106,7 +106,7 @@ const char RideTypeViewOrder[] = { RIDE_TYPE_SPIRAL_SLIDE, RIDE_TYPE_DODGEMS, RIDE_TYPE_SPACE_RINGS, - RIDE_TYPE_CIRCUS_SHOW, + RIDE_TYPE_CIRCUS, RIDE_TYPE_GHOST_TRAIN, RIDE_TYPE_FLYING_SAUCERS, @@ -114,7 +114,7 @@ const char RideTypeViewOrder[] = { RIDE_TYPE_TWIST, RIDE_TYPE_MAGIC_CARPET, RIDE_TYPE_LAUNCHED_FREEFALL, - RIDE_TYPE_PIRATE_SHIP, + RIDE_TYPE_SWINGING_SHIP, RIDE_TYPE_GO_KARTS, RIDE_TYPE_SWINGING_INVERTER_SHIP, RIDE_TYPE_MOTION_SIMULATOR, diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 0ac0c170a4..29b079246b 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2095,7 +2095,7 @@ static void window_ride_construction_invalidate(rct_window *w) stringId = RideConfigurationStringIds[_currentTrackCurve & 0xFF]; if (stringId == STR_RAPIDS && ride->type == RIDE_TYPE_CAR_RIDE) stringId = STR_LOG_BUMPS; - if (stringId == STR_SPINNING_CONTROL_TOGGLE_TRACK && ride->type != RIDE_TYPE_WILD_MOUSE) { + if (stringId == STR_SPINNING_CONTROL_TOGGLE_TRACK && ride->type != RIDE_TYPE_STEEL_WILD_MOUSE) { stringId = STR_BOOSTER; } } @@ -2916,7 +2916,7 @@ static void window_ride_construction_update_widgets(rct_window *w) bool brakesSelected = _selectedTrackType == TRACK_ELEM_BRAKES || _currentTrackCurve == (0x100 | TRACK_ELEM_BRAKES); _boosterTrackSelected = track_element_is_booster(ride->type, _selectedTrackType) || - (ride->type != RIDE_TYPE_WILD_MOUSE && _currentTrackCurve == (0x100 | TRACK_ELEM_BOOSTER)); + (ride->type != RIDE_TYPE_STEEL_WILD_MOUSE && _currentTrackCurve == (0x100 | TRACK_ELEM_BOOSTER)); if (!brakesSelected && !_boosterTrackSelected) { if (is_track_enabled(TRACK_FLAT_ROLL_BANKING)) { @@ -3201,7 +3201,7 @@ static void window_ride_construction_show_special_track_dropdown(rct_window *w, } if (trackPieceStringId == STR_SPINNING_CONTROL_TOGGLE_TRACK) { Ride *ride = get_ride(_currentRideIndex); - if (ride->type != RIDE_TYPE_WILD_MOUSE) + if (ride->type != RIDE_TYPE_STEEL_WILD_MOUSE) trackPieceStringId = STR_BOOSTER; } gDropdownItemsFormat[i] = trackPieceStringId; diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/localisation.c index cd73bb4229..9dd2fb1190 100644 --- a/src/openrct2/localisation/localisation.c +++ b/src/openrct2/localisation/localisation.c @@ -157,7 +157,7 @@ const rct_string_id PeepThoughts[] = { STR_PEEP_THOUGHT_TYPE_HAT, STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE, STR_PEEP_THOUGHT_TYPE_TSHIRT, - STR_PEEP_THOUGHT_TYPE_DONUT, + STR_PEEP_THOUGHT_TYPE_DOUGHNUT, STR_PEEP_THOUGHT_TYPE_COFFEE, 0, STR_PEEP_THOUGHT_TYPE_CHICKEN, @@ -191,7 +191,7 @@ const rct_string_id PeepThoughts[] = { STR_PEEP_THOUGHT_TYPE_HAT_MUCH, STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE_MUCH, STR_PEEP_THOUGHT_TYPE_TSHIRT_MUCH, - STR_PEEP_THOUGHT_TYPE_DONUT_MUCH, + STR_PEEP_THOUGHT_TYPE_DOUGHNUT_MUCH, STR_PEEP_THOUGHT_TYPE_COFFEE_MUCH, 0, STR_PEEP_THOUGHT_TYPE_CHICKEN_MUCH, diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index 13ae4cc226..372d9b3e9f 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -969,7 +969,7 @@ enum { STR_PEEP_THOUGHT_TYPE_HAT = 1536, STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE = 1537, STR_PEEP_THOUGHT_TYPE_TSHIRT = 1538, - STR_PEEP_THOUGHT_TYPE_DONUT = 1539, + STR_PEEP_THOUGHT_TYPE_DOUGHNUT = 1539, STR_PEEP_THOUGHT_TYPE_COFFEE = 1540, // STR_1541 : STR_PEEP_THOUGHT_TYPE_CHICKEN = 1542, @@ -1003,7 +1003,7 @@ enum { STR_PEEP_THOUGHT_TYPE_HAT_MUCH = 1570, STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE_MUCH = 1571, STR_PEEP_THOUGHT_TYPE_TSHIRT_MUCH = 1572, - STR_PEEP_THOUGHT_TYPE_DONUT_MUCH = 1573, + STR_PEEP_THOUGHT_TYPE_DOUGHNUT_MUCH = 1573, STR_PEEP_THOUGHT_TYPE_COFFEE_MUCH = 1574, // STR_1575 : STR_PEEP_THOUGHT_TYPE_CHICKEN_MUCH = 1576, diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 487624e64c..ea3775be8d 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -822,7 +822,7 @@ static const uint8 byte_9822F4[] = { 0, // SHOP_ITEM_HAT 50, // SHOP_ITEM_TOFFEE_APPLE 0, // SHOP_ITEM_TSHIRT - 80, // SHOP_ITEM_DONUT + 80, // SHOP_ITEM_DOUGHNUT 90, // SHOP_ITEM_COFFEE 0, // SHOP_ITEM_EMPTY_CUP 170, // SHOP_ITEM_CHICKEN @@ -900,7 +900,7 @@ static const uint8 peep_item_containers[] = { 0xFF, // PEEP_ITEM_HAT 0xFF, // PEEP_ITEM_TOFFEE_APPLE 0xFF, // PEEP_ITEM_TSHIRT - 0xFF, // PEEP_ITEM_DONUT + 0xFF, // PEEP_ITEM_DOUGHNUT SHOP_ITEM_EMPTY_CUP, // PEEP_ITEM_COFFEE 0xFF, // PEEP_ITEM_EMPTY_CUP SHOP_ITEM_EMPTY_BOX, // PEEP_ITEM_CHICKEN @@ -1855,7 +1855,7 @@ static item_pref_t item_order_preference[] = { { 0, PEEP_ITEM_HOT_DOG, PEEP_SPRITE_TYPE_HOT_DOG }, { 0, PEEP_ITEM_TENTACLE, PEEP_SPRITE_TYPE_TENTACLE }, { 0, PEEP_ITEM_TOFFEE_APPLE, PEEP_SPRITE_TYPE_TOFFEE_APPLE }, - { 0, PEEP_ITEM_DONUT, PEEP_SPRITE_TYPE_DONUT }, + { 0, PEEP_ITEM_DOUGHNUT, PEEP_SPRITE_TYPE_DOUGHNUT }, { 1, PEEP_ITEM_PRETZEL, PEEP_SPRITE_TYPE_PRETZEL }, { 1, PEEP_ITEM_COOKIE, PEEP_SPRITE_TYPE_PRETZEL }, { 1, PEEP_ITEM_CHOCOLATE, PEEP_SPRITE_TYPE_COFFEE }, @@ -5389,7 +5389,7 @@ static void peep_update_queuing(rct_peep * peep) case PEEP_SPRITE_TYPE_HOT_DOG: case PEEP_SPRITE_TYPE_TENTACLE: case PEEP_SPRITE_TYPE_TOFFEE_APPLE: - case PEEP_SPRITE_TYPE_DONUT: + case PEEP_SPRITE_TYPE_DOUGHNUT: case PEEP_SPRITE_TYPE_COFFEE: case PEEP_SPRITE_TYPE_CHICKEN: case PEEP_SPRITE_TYPE_LEMONADE: @@ -6315,7 +6315,7 @@ static const uint8 item_standard_litter[32] = { LITTER_TYPE_RUBBISH, // PEEP_ITEM_HAT LITTER_TYPE_RUBBISH, // PEEP_ITEM_TOFFEE_APPLE LITTER_TYPE_RUBBISH, // PEEP_ITEM_TSHIRT - LITTER_TYPE_RUBBISH, // PEEP_ITEM_DONUT + LITTER_TYPE_RUBBISH, // PEEP_ITEM_DOUGHNUT LITTER_TYPE_RUBBISH, // PEEP_ITEM_COFFEE LITTER_TYPE_EMPTY_CUP, // PEEP_ITEM_EMPTY_CUP LITTER_TYPE_EMPTY_BOX, // PEEP_ITEM_CHICKEN @@ -8452,7 +8452,7 @@ static sint32 peep_has_food_standard_flag(rct_peep * peep) return peep->item_standard_flags & (PEEP_ITEM_DRINK | PEEP_ITEM_BURGER | PEEP_ITEM_CHIPS | PEEP_ITEM_ICE_CREAM | PEEP_ITEM_CANDYFLOSS | PEEP_ITEM_PIZZA | PEEP_ITEM_POPCORN | PEEP_ITEM_HOT_DOG | PEEP_ITEM_TENTACLE | PEEP_ITEM_TOFFEE_APPLE | - PEEP_ITEM_DONUT | PEEP_ITEM_COFFEE | PEEP_ITEM_CHICKEN | PEEP_ITEM_LEMONADE); + PEEP_ITEM_DOUGHNUT | PEEP_ITEM_COFFEE | PEEP_ITEM_CHICKEN | PEEP_ITEM_LEMONADE); } static sint32 peep_has_food_extra_flag(rct_peep * peep) diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 0c874780fe..63ea644cd2 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -101,7 +101,7 @@ enum PEEP_THOUGHT_TYPE PEEP_THOUGHT_TYPE_HAT = 56, PEEP_THOUGHT_TYPE_TOFFEE_APPLE = 57, PEEP_THOUGHT_TYPE_TSHIRT = 58, - PEEP_THOUGHT_TYPE_DONUT = 59, + PEEP_THOUGHT_TYPE_DOUGHNUT = 59, PEEP_THOUGHT_TYPE_COFFEE = 60, PEEP_THOUGHT_TYPE_CHICKEN = 62, @@ -130,7 +130,7 @@ enum PEEP_THOUGHT_TYPE PEEP_THOUGHT_TYPE_HAT_MUCH = 90, PEEP_THOUGHT_TYPE_TOFFEE_APPLE_MUCH = 91, PEEP_THOUGHT_TYPE_TSHIRT_MUCH = 92, - PEEP_THOUGHT_TYPE_DONUT_MUCH = 93, + PEEP_THOUGHT_TYPE_DOUGHNUT_MUCH = 93, PEEP_THOUGHT_TYPE_COFFEE_MUCH = 94, PEEP_THOUGHT_TYPE_CHICKEN_MUCH = 96, @@ -363,7 +363,7 @@ enum PEEP_ITEM PEEP_ITEM_HAT = (1 << 18), PEEP_ITEM_TOFFEE_APPLE = (1 << 19), PEEP_ITEM_TSHIRT = (1 << 20), - PEEP_ITEM_DONUT = (1 << 21), + PEEP_ITEM_DOUGHNUT = (1 << 21), PEEP_ITEM_COFFEE = (1 << 22), PEEP_ITEM_EMPTY_CUP = (1 << 23), PEEP_ITEM_CHICKEN = (1 << 24), @@ -432,7 +432,7 @@ enum PEEP_SPRITE_TYPE PEEP_SPRITE_TYPE_HOT_DOG = 31, PEEP_SPRITE_TYPE_TENTACLE = 32, PEEP_SPRITE_TYPE_TOFFEE_APPLE = 33, - PEEP_SPRITE_TYPE_DONUT = 34, + PEEP_SPRITE_TYPE_DOUGHNUT = 34, PEEP_SPRITE_TYPE_COFFEE = 35, PEEP_SPRITE_TYPE_CHICKEN = 36, PEEP_SPRITE_TYPE_LEMONADE = 37, diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index 2b996dea16..f35e3d34bf 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -856,7 +856,7 @@ enum { RCT1_RIDE_TYPE_TWIST, RCT1_RIDE_TYPE_HAUNTED_HOUSE, RCT1_RIDE_TYPE_POPCORN_STALL, - RCT1_RIDE_TYPE_CIRCUS_SHOW, + RCT1_RIDE_TYPE_CIRCUS, RCT1_RIDE_TYPE_GHOST_TRAIN, RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER, RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER, diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 79c913c40f..702ff7433a 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -105,7 +105,7 @@ namespace RCT1 PEEP_SPRITE_TYPE_HOT_DOG, // 0x1C PEEP_SPRITE_TYPE_TENTACLE, // 0x1D PEEP_SPRITE_TYPE_TOFFEE_APPLE, // 0x1E - PEEP_SPRITE_TYPE_DONUT, // 0x1F + PEEP_SPRITE_TYPE_DOUGHNUT, // 0x1F PEEP_SPRITE_TYPE_COFFEE, // 0x20 PEEP_SPRITE_TYPE_CHICKEN, // 0x21 PEEP_SPRITE_TYPE_LEMONADE, // 0x22 @@ -198,7 +198,7 @@ namespace RCT1 RIDE_TYPE_LOG_FLUME, RIDE_TYPE_RIVER_RAPIDS, RIDE_TYPE_DODGEMS, - RIDE_TYPE_PIRATE_SHIP, + RIDE_TYPE_SWINGING_SHIP, RIDE_TYPE_SWINGING_INVERTER_SHIP, RIDE_TYPE_FOOD_STALL, RIDE_TYPE_FOOD_STALL, @@ -221,12 +221,12 @@ namespace RCT1 RIDE_TYPE_TWIST, RIDE_TYPE_HAUNTED_HOUSE, RIDE_TYPE_FOOD_STALL, - RIDE_TYPE_CIRCUS_SHOW, + RIDE_TYPE_CIRCUS, RIDE_TYPE_GHOST_TRAIN, RIDE_TYPE_TWISTER_ROLLER_COASTER, RIDE_TYPE_WOODEN_ROLLER_COASTER, RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER, - RIDE_TYPE_WILD_MOUSE, + RIDE_TYPE_STEEL_WILD_MOUSE, RIDE_TYPE_FOOD_STALL, RIDE_TYPE_FOOD_STALL, RIDE_TYPE_SHOP, @@ -737,7 +737,7 @@ namespace RCT1 "TWIST1 ", // RCT1_RIDE_TYPE_TWIST "HHBUILD ", // RCT1_RIDE_TYPE_HAUNTED_HOUSE "POPCS ", // RCT1_RIDE_TYPE_POPCORN_STALL - "CIRCUS1 ", // RCT1_RIDE_TYPE_CIRCUS_SHOW + "CIRCUS1 ", // RCT1_RIDE_TYPE_CIRCUS "GTC ", // RCT1_RIDE_TYPE_GHOST_TRAIN "BMSD ", // RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER "MFT ", // RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER diff --git a/src/openrct2/ride/RideGroupManager.cpp b/src/openrct2/ride/RideGroupManager.cpp index c72de4579b..d4b9d061c5 100644 --- a/src/openrct2/ride/RideGroupManager.cpp +++ b/src/openrct2/ride/RideGroupManager.cpp @@ -84,14 +84,14 @@ static const RideGroup ride_group_classic_mini_coaster = { }; static const RideGroup ride_group_steel_wild_mouse = { - /*.RideType =*/ RIDE_TYPE_WILD_MOUSE, + /*.RideType =*/ RIDE_TYPE_STEEL_WILD_MOUSE, /*.MaximumHeight =*/ 16, /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES), /*.Naming =*/ { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, }; static const RideGroup ride_group_spinning_wild_mouse = { - /*.RideType =*/ RIDE_TYPE_WILD_MOUSE, + /*.RideType =*/ RIDE_TYPE_STEEL_WILD_MOUSE, /*.MaximumHeight =*/ 16, /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_ROTATION_CONTROL_TOGGLE), /*.Naming =*/ { STR_SPINNING_WILD_MOUSE_GROUP, STR_SPINNING_WILD_MOUSE_GROUP_DESC }, @@ -127,7 +127,7 @@ static const RideGroup steel_wild_mouse_groups[MAX_RIDE_GROUPS_PER_RIDE_TYPE] = return &ride_group_steel_twister_rc; else return &ride_group_hyper_twister; - case RIDE_TYPE_WILD_MOUSE: + case RIDE_TYPE_STEEL_WILD_MOUSE: if (rideEntry->enabledTrackPieces & (1ULL << TRACK_SLOPE_STEEP)) return &ride_group_steel_wild_mouse; else @@ -150,7 +150,7 @@ bool RideGroupManager::RideTypeHasRideGroups(const uint8 rideType) case RIDE_TYPE_JUNIOR_ROLLER_COASTER: case RIDE_TYPE_CAR_RIDE: case RIDE_TYPE_TWISTER_ROLLER_COASTER: - case RIDE_TYPE_WILD_MOUSE: + case RIDE_TYPE_STEEL_WILD_MOUSE: return true; default: return false; @@ -172,7 +172,7 @@ const RideGroup * RideGroupManager::RideGroupFind(const uint8 rideType, const ui return &car_ride_groups[index]; case RIDE_TYPE_TWISTER_ROLLER_COASTER: return &twister_rc_groups[index]; - case RIDE_TYPE_WILD_MOUSE: + case RIDE_TYPE_STEEL_WILD_MOUSE: return &steel_wild_mouse_groups[index]; default: return nullptr; @@ -245,7 +245,7 @@ const std::vector RideGroupManager::GetPreferredRideEntryOrder(con { "LFB1 " }, // RIDE_TYPE_LOG_FLUME { "RAPBOAT " }, // RIDE_TYPE_RIVER_RAPIDS { }, // RIDE_TYPE_DODGEMS - { }, // RIDE_TYPE_PIRATE_SHIP + { }, // RIDE_TYPE_SWINGING_SHIP { }, // RIDE_TYPE_SWINGING_INVERTER_SHIP { }, // RIDE_TYPE_FOOD_STALL { }, // RIDE_TYPE_1D @@ -268,12 +268,12 @@ const std::vector RideGroupManager::GetPreferredRideEntryOrder(con { }, // RIDE_TYPE_TWIST { }, // RIDE_TYPE_HAUNTED_HOUSE { }, // RIDE_TYPE_FIRST_AID - { }, // RIDE_TYPE_CIRCUS_SHOW + { }, // RIDE_TYPE_CIRCUS { "GTC ", "HMCAR " }, // RIDE_TYPE_GHOST_TRAIN { "BMSD ", "BMSU ", "BMFL ", "BMRB ", "GOLTR " }, // RIDE_TYPE_TWISTER_ROLLER_COASTER { "PTCT1 ", "MFT ", "PTCT2 " }, // RIDE_TYPE_WOODEN_ROLLER_COASTER { "SFRIC1 " }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { "SMC1 ", "SMC2 ", "WMSPIN " }, // RIDE_TYPE_WILD_MOUSE + { "SMC1 ", "SMC2 ", "WMSPIN " }, // RIDE_TYPE_STEEL_WILD_MOUSE { "ARRX " }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER { }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT { "BMAIR " }, // RIDE_TYPE_FLYING_ROLLER_COASTER diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index dc6916b6ec..94d222d688 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -2600,7 +2600,7 @@ bool track_element_is_covered(sint32 trackElementType) bool track_element_is_booster(uint8 rideType, uint8 trackType) { // Boosters share their ID with the Spinning Control track. - if (rideType != RIDE_TYPE_WILD_MOUSE && trackType == TRACK_ELEM_BOOSTER) + if (rideType != RIDE_TYPE_STEEL_WILD_MOUSE && trackType == TRACK_ELEM_BOOSTER) { return true; } diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index 652138fff5..5135aff029 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -1082,7 +1082,7 @@ const uint64 RideTypePossibleTrackConfigurations[RIDE_TYPE_COUNT] = { /* RIDE_TYPE_LOG_FLUME */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_LOG_FLUME_REVERSER), /* RIDE_TYPE_RIVER_RAPIDS */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_RAPIDS), /* RIDE_TYPE_DODGEMS */ 0, - /* RIDE_TYPE_PIRATE_SHIP */ 0, + /* RIDE_TYPE_SWINGING_SHIP */ 0, /* RIDE_TYPE_SWINGING_INVERTER_SHIP */ 0, /* RIDE_TYPE_FOOD_STALL */ 0, /* RIDE_TYPE_1D */ 0, @@ -1105,12 +1105,12 @@ const uint64 RideTypePossibleTrackConfigurations[RIDE_TYPE_COUNT] = { /* RIDE_TYPE_TWIST */ 0, /* RIDE_TYPE_HAUNTED_HOUSE */ 0, /* RIDE_TYPE_FIRST_AID */ 0, - /* RIDE_TYPE_CIRCUS_SHOW */ 0, + /* RIDE_TYPE_CIRCUS */ 0, /* RIDE_TYPE_GHOST_TRAIN */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_SPINNING_TUNNEL), /* RIDE_TYPE_TWISTER_ROLLER_COASTER */ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BARREL_ROLL) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_HALF_LOOP_LARGE) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG) | (1ULL << TRACK_CURVE_VERTICAL) | (1ULL << TRACK_QUARTER_LOOP) | (1ULL << TRACK_BOOSTER), /* RIDE_TYPE_WOODEN_ROLLER_COASTER */ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_WATER_SPLASH) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING), /* RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_BRAKES), - /* RIDE_TYPE_WILD_MOUSE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_ROTATION_CONTROL_TOGGLE), + /* RIDE_TYPE_STEEL_WILD_MOUSE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_ROTATION_CONTROL_TOGGLE), /* RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_INLINE_TWIST_UNINVERTED) | (1ULL << TRACK_QUARTER_LOOP_UNINVERTED), /* RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_INLINE_TWIST_INVERTED) | (1ULL << TRACK_QUARTER_LOOP_INVERTED), /* RIDE_TYPE_FLYING_ROLLER_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_INLINE_TWIST_UNINVERTED) | (1ULL << TRACK_HALF_LOOP_UNINVERTED), @@ -6273,7 +6273,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[RIDE_TYPE_COUNT] = get_track_paint_function_log_flume, // RIDE_TYPE_LOG_FLUME get_track_paint_function_river_rapids, // RIDE_TYPE_RIVER_RAPIDS get_track_paint_function_dodgems, // RIDE_TYPE_DODGEMS - get_track_paint_function_pirate_ship, // RIDE_TYPE_PIRATE_SHIP + get_track_paint_function_pirate_ship, // RIDE_TYPE_SWINGING_SHIP get_track_paint_function_swinging_inverter_ship, // RIDE_TYPE_SWINGING_INVERTER_SHIP get_track_paint_function_shop, // RIDE_TYPE_FOOD_STALL get_track_paint_function_shop, // RIDE_TYPE_1D @@ -6296,12 +6296,12 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[RIDE_TYPE_COUNT] = get_track_paint_function_twist, // RIDE_TYPE_TWIST get_track_paint_function_haunted_house, // RIDE_TYPE_HAUNTED_HOUSE get_track_paint_function_facility, // RIDE_TYPE_FIRST_AID - get_track_paint_function_circus_show, // RIDE_TYPE_CIRCUS_SHOW + get_track_paint_function_circus_show, // RIDE_TYPE_CIRCUS get_track_paint_function_ghost_train, // RIDE_TYPE_GHOST_TRAIN get_track_paint_function_twister_rc, // RIDE_TYPE_TWISTER_ROLLER_COASTER get_track_paint_function_wooden_rc, // RIDE_TYPE_WOODEN_ROLLER_COASTER get_track_paint_function_side_friction_rc, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - get_track_paint_function_wild_mouse, // RIDE_TYPE_WILD_MOUSE + get_track_paint_function_wild_mouse, // RIDE_TYPE_STEEL_WILD_MOUSE get_track_paint_function_multi_dimension_rc, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER 0, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT get_track_paint_function_flying_rc, // RIDE_TYPE_FLYING_ROLLER_COASTER diff --git a/src/openrct2/ride/TrackDataOld.cpp b/src/openrct2/ride/TrackDataOld.cpp index 8b4a2b72cf..af1cebf82e 100644 --- a/src/openrct2/ride/TrackDataOld.cpp +++ b/src/openrct2/ride/TrackDataOld.cpp @@ -19293,7 +19293,7 @@ const uint32 * RideTypeTrackPaintFunctionsOld[RIDE_TYPE_COUNT] = { _OldLogFlumeTrackPaintFunctions, // RIDE_TYPE_LOG_FLUME _OldRiverRapidsTrackPaintFunctions, // RIDE_TYPE_RIVER_RAPIDS _OldDodgemsTrackPaintFunctions, // RIDE_TYPE_DODGEMS - _OldPirateShipTrackPaintFunctions, // RIDE_TYPE_PIRATE_SHIP + _OldPirateShipTrackPaintFunctions, // RIDE_TYPE_SWINGING_SHIP _OldSwingingInverterShipTrackPaintFunctions, // RIDE_TYPE_SWINGING_INVERTER_SHIP _OldShopTrackPaintFunctions, // RIDE_TYPE_FOOD_STALL _OldShopTrackPaintFunctions, // RIDE_TYPE_1D @@ -19316,12 +19316,12 @@ const uint32 * RideTypeTrackPaintFunctionsOld[RIDE_TYPE_COUNT] = { _OldTwistTrackPaintFunctions, // RIDE_TYPE_TWIST _OldHauntedHouseTrackPaintFunctions, // RIDE_TYPE_HAUNTED_HOUSE _OldFacilityTrackPaintFunctions, // RIDE_TYPE_FIRST_AID - _OldCircusShowTrackPaintFunctions, // RIDE_TYPE_CIRCUS_SHOW + _OldCircusShowTrackPaintFunctions, // RIDE_TYPE_CIRCUS _OldGhostTrainTrackPaintFunctions, // RIDE_TYPE_GHOST_TRAIN _OldTwisterRollerCoasterTrackPaintFunctions, // RIDE_TYPE_TWISTER_ROLLER_COASTER _OldWoodenRollerCoasterTrackPaintFunctions, // RIDE_TYPE_WOODEN_ROLLER_COASTER _OldSideFrictionRollerCoasterTrackPaintFunctions, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - _OldWildMouseTrackPaintFunctions, // RIDE_TYPE_WILD_MOUSE + _OldWildMouseTrackPaintFunctions, // RIDE_TYPE_STEEL_WILD_MOUSE _OldMultiDimensionRollerCoasterTrackPaintFunctions, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER _OldMultiDimensionRollerCoasterTrackPaintFunctions, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT _OldFlyingRollerCoasterTrackPaintFunctions, // RIDE_TYPE_FLYING_ROLLER_COASTER diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 889228a6cc..2dfc2ee75e 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -8091,7 +8091,7 @@ loc_6DB41D: } { uint16 rideType = get_ride(track_element_get_ride_index(tileElement))->type; - if (trackType == TRACK_ELEM_ROTATION_CONTROL_TOGGLE && rideType == RIDE_TYPE_WILD_MOUSE) + if (trackType == TRACK_ELEM_ROTATION_CONTROL_TOGGLE && rideType == RIDE_TYPE_STEEL_WILD_MOUSE) { vehicle->update_flags ^= VEHICLE_UPDATE_FLAG_13; } diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 4846c66ffb..5247b5b326 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -2803,7 +2803,7 @@ static void ride_music_update(sint32 rideIndex) return; } - if (ride->type == RIDE_TYPE_CIRCUS_SHOW) { + if (ride->type == RIDE_TYPE_CIRCUS) { rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[0]); if (vehicle->status != VEHICLE_STATUS_DOING_CIRCUS_SHOW) { ride->music_tune_id = 255; @@ -7715,7 +7715,7 @@ bool shop_item_is_food_or_drink(sint32 shopItem) case SHOP_ITEM_HOT_DOG: case SHOP_ITEM_TENTACLE: case SHOP_ITEM_TOFFEE_APPLE: - case SHOP_ITEM_DONUT: + case SHOP_ITEM_DOUGHNUT: case SHOP_ITEM_COFFEE: case SHOP_ITEM_CHICKEN: case SHOP_ITEM_LEMONADE: @@ -7751,7 +7751,7 @@ bool shop_item_is_food(sint32 shopItem) case SHOP_ITEM_HOT_DOG: case SHOP_ITEM_TENTACLE: case SHOP_ITEM_TOFFEE_APPLE: - case SHOP_ITEM_DONUT: + case SHOP_ITEM_DOUGHNUT: case SHOP_ITEM_CHICKEN: case SHOP_ITEM_PRETZEL: case SHOP_ITEM_FUNNEL_CAKE: @@ -8048,7 +8048,7 @@ const char * ride_type_get_enum_name(sint32 rideType) nameof(RIDE_TYPE_LOG_FLUME), nameof(RIDE_TYPE_RIVER_RAPIDS), nameof(RIDE_TYPE_DODGEMS), - nameof(RIDE_TYPE_PIRATE_SHIP), + nameof(RIDE_TYPE_SWINGING_SHIP), nameof(RIDE_TYPE_SWINGING_INVERTER_SHIP), nameof(RIDE_TYPE_FOOD_STALL), nameof(RIDE_TYPE_1D), @@ -8071,12 +8071,12 @@ const char * ride_type_get_enum_name(sint32 rideType) nameof(RIDE_TYPE_TWIST), nameof(RIDE_TYPE_HAUNTED_HOUSE), nameof(RIDE_TYPE_FIRST_AID), - nameof(RIDE_TYPE_CIRCUS_SHOW), + nameof(RIDE_TYPE_CIRCUS), nameof(RIDE_TYPE_GHOST_TRAIN), nameof(RIDE_TYPE_TWISTER_ROLLER_COASTER), nameof(RIDE_TYPE_WOODEN_ROLLER_COASTER), nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER), - nameof(RIDE_TYPE_WILD_MOUSE), + nameof(RIDE_TYPE_STEEL_WILD_MOUSE), nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER), nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT), nameof(RIDE_TYPE_FLYING_ROLLER_COASTER), diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h index 6ec57a7e48..b5fc314f42 100644 --- a/src/openrct2/ride/ride.h +++ b/src/openrct2/ride/ride.h @@ -494,7 +494,7 @@ enum { RIDE_TYPE_LOG_FLUME, RIDE_TYPE_RIVER_RAPIDS, RIDE_TYPE_DODGEMS, - RIDE_TYPE_PIRATE_SHIP, + RIDE_TYPE_SWINGING_SHIP, RIDE_TYPE_SWINGING_INVERTER_SHIP, RIDE_TYPE_FOOD_STALL, RIDE_TYPE_1D, @@ -517,12 +517,12 @@ enum { RIDE_TYPE_TWIST, RIDE_TYPE_HAUNTED_HOUSE, RIDE_TYPE_FIRST_AID, - RIDE_TYPE_CIRCUS_SHOW, + RIDE_TYPE_CIRCUS, RIDE_TYPE_GHOST_TRAIN = 50, RIDE_TYPE_TWISTER_ROLLER_COASTER, RIDE_TYPE_WOODEN_ROLLER_COASTER, RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER, - RIDE_TYPE_WILD_MOUSE, + RIDE_TYPE_STEEL_WILD_MOUSE, RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER, RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT, RIDE_TYPE_FLYING_ROLLER_COASTER, @@ -895,7 +895,7 @@ enum { SHOP_ITEM_HAT, SHOP_ITEM_TOFFEE_APPLE, SHOP_ITEM_TSHIRT, - SHOP_ITEM_DONUT, + SHOP_ITEM_DOUGHNUT, SHOP_ITEM_COFFEE, SHOP_ITEM_EMPTY_CUP, SHOP_ITEM_CHICKEN, diff --git a/src/openrct2/ride/ride_data.c b/src/openrct2/ride/ride_data.c index f801d552e4..d548228f6c 100644 --- a/src/openrct2/ride/ride_data.c +++ b/src/openrct2/ride/ride_data.c @@ -844,7 +844,7 @@ const rct_ride_name RideNaming[] = { { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }, // RIDE_TYPE_LOG_FLUME { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }, // RIDE_TYPE_RIVER_RAPIDS { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS }, // RIDE_TYPE_DODGEMS - { STR_RIDE_NAME_PIRATE_SHIP, STR_RIDE_DESCRIPTION_PIRATE_SHIP }, // RIDE_TYPE_PIRATE_SHIP + { STR_RIDE_NAME_PIRATE_SHIP, STR_RIDE_DESCRIPTION_PIRATE_SHIP }, // RIDE_TYPE_SWINGING_SHIP { STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP }, // RIDE_TYPE_SWINGING_INVERTER_SHIP { STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL }, // RIDE_TYPE_FOOD_STALL { STR_RIDE_NAME_1D, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_1D @@ -867,12 +867,12 @@ const rct_ride_name RideNaming[] = { { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST }, // RIDE_TYPE_TWIST { STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE }, // RIDE_TYPE_HAUNTED_HOUSE { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID }, // RIDE_TYPE_FIRST_AID - { STR_RIDE_NAME_CIRCUS_SHOW, STR_RIDE_DESCRIPTION_CIRCUS_SHOW }, // RIDE_TYPE_CIRCUS_SHOW + { STR_RIDE_NAME_CIRCUS_SHOW, STR_RIDE_DESCRIPTION_CIRCUS_SHOW }, // RIDE_TYPE_CIRCUS { STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN }, // RIDE_TYPE_GHOST_TRAIN { STR_RIDE_NAME_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER }, // RIDE_TYPE_TWISTER_ROLLER_COASTER { STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER }, // RIDE_TYPE_WOODEN_ROLLER_COASTER { STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, // RIDE_TYPE_WILD_MOUSE + { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, // RIDE_TYPE_STEEL_WILD_MOUSE { STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER { STR_RIDE_NAME_38, STR_RIDE_DESCRIPTION_UNKNOWN }, // RIDE_TYPE_38 { STR_RIDE_NAME_FLYING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER }, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -1152,7 +1152,7 @@ const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT] = { { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_WATER, 0 }, // RIDE_TYPE_LOG_FLUME { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_WATER, 0 }, // RIDE_TYPE_RIVER_RAPIDS { 15, 0, RIDE_TYPE_FLAG4_MUSIC_ON_DEFAULT | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SLIGHTLY_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_DODGEMS_BEAT, 0 }, // RIDE_TYPE_DODGEMS - { 15, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_PIRATES, 0 }, // RIDE_TYPE_PIRATE_SHIP + { 15, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_PIRATES, 0 }, // RIDE_TYPE_SWINGING_SHIP { 15, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_TECHNO, 0 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP { 9, 0, 0, MUSIC_STYLE_GENTLE, 0 }, // RIDE_TYPE_FOOD_STALL { 15, 0, 0, MUSIC_STYLE_GENTLE, 0 }, // RIDE_TYPE_1D @@ -1175,12 +1175,12 @@ const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT] = { { 10, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_GENTLE, 0 }, // RIDE_TYPE_TWIST { 10, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION, MUSIC_STYLE_HORROR, 0 }, // RIDE_TYPE_HAUNTED_HOUSE { 0, 0, 0, MUSIC_STYLE_GENTLE, 0 }, // RIDE_TYPE_FIRST_AID - { 15, 0, RIDE_TYPE_FLAG4_MUSIC_ON_DEFAULT | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION, MUSIC_STYLE_CIRCUS_SHOW, 0 }, // RIDE_TYPE_CIRCUS_SHOW + { 15, 0, RIDE_TYPE_FLAG4_MUSIC_ON_DEFAULT | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_SINGLE_SESSION, MUSIC_STYLE_CIRCUS_SHOW, 0 }, // RIDE_TYPE_CIRCUS { 15, 0, RIDE_TYPE_FLAG4_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_HORROR, 0 }, // RIDE_TYPE_GHOST_TRAIN { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_ROCK, 0 }, // RIDE_TYPE_TWISTER_ROLLER_COASTER { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_WILD_WEST, 0 }, // RIDE_TYPE_WOODEN_ROLLER_COASTER { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_GENTLE, 0 }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { 20, 20, RIDE_TYPE_FLAG4_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_ROCK, 0 }, // RIDE_TYPE_WILD_MOUSE + { 20, 20, RIDE_TYPE_FLAG4_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_ROCK, 0 }, // RIDE_TYPE_STEEL_WILD_MOUSE { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_ROCK_STYLE_3, RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_GENTLE, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT { 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ALTERNATIVE_TRACK_TYPE | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG4_START_CONSTRUCTION_INVERTED, MUSIC_STYLE_ROCK, RIDE_TYPE_FLYING_ROLLER_COASTER_ALT }, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -1247,7 +1247,7 @@ const ride_cost RideTrackCosts[RIDE_TYPE_COUNT] = { { 45, 5 }, // RIDE_TYPE_LOG_FLUME { 62, 6 }, // RIDE_TYPE_RIVER_RAPIDS { 55, 2 }, // RIDE_TYPE_DODGEMS - { 155, 2 }, // RIDE_TYPE_PIRATE_SHIP + { 155, 2 }, // RIDE_TYPE_SWINGING_SHIP { 212, 2 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP { 600, 0 }, // RIDE_TYPE_FOOD_STALL { 700, 0 }, // RIDE_TYPE_1D @@ -1270,12 +1270,12 @@ const ride_cost RideTrackCosts[RIDE_TYPE_COUNT] = { { 90, 2 }, // RIDE_TYPE_TWIST { 85, 2 }, // RIDE_TYPE_HAUNTED_HOUSE { 500, 0 }, // RIDE_TYPE_FIRST_AID - { 125, 2 }, // RIDE_TYPE_CIRCUS_SHOW + { 125, 2 }, // RIDE_TYPE_CIRCUS { 26, 5 }, // RIDE_TYPE_GHOST_TRAIN { 120, 5 }, // RIDE_TYPE_TWISTER_ROLLER_COASTER { 75, 7 }, // RIDE_TYPE_WOODEN_ROLLER_COASTER { 55, 6 }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { 55, 4 }, // RIDE_TYPE_WILD_MOUSE + { 55, 4 }, // RIDE_TYPE_STEEL_WILD_MOUSE { 180, 5 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER { 180, 5 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT { 125, 5 }, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -1342,7 +1342,7 @@ const rct_ride_data_5 RideData5[RIDE_TYPE_COUNT] = { { 9, 24, 7, 255, 9, 40, 65, 0 }, // RIDE_TYPE_LOG_FLUME { 9, 32, 14, 255, 15, 40, 70, 0 }, // RIDE_TYPE_RIVER_RAPIDS { 9, 48, 2, 255, 2, 1, 35, 0 }, // RIDE_TYPE_DODGEMS - { 12, 112, 7, 255, 11, 1, 35, 0 }, // RIDE_TYPE_PIRATE_SHIP + { 12, 112, 7, 255, 11, 1, 35, 0 }, // RIDE_TYPE_SWINGING_SHIP { 15, 176, 7, 255, 11, 1, 35, 0 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP { 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_FOOD_STALL { 12, 64, 0, 255, 0, 1, 15, 0 }, // RIDE_TYPE_1D @@ -1365,12 +1365,12 @@ const rct_ride_data_5 RideData5[RIDE_TYPE_COUNT] = { { 12, 64, 3, 255, 2, 1, 40, 0 }, // RIDE_TYPE_TWIST { 16, 160, 3, 255, 2, 1, 22, 0 }, // RIDE_TYPE_HAUNTED_HOUSE { 12, 48, 0, 255, 0, 1, 5, 0 }, // RIDE_TYPE_FIRST_AID - { 12, 128, 3, 255, 2, 1, 39, 0 }, // RIDE_TYPE_CIRCUS_SHOW + { 12, 128, 3, 255, 2, 1, 39, 0 }, // RIDE_TYPE_CIRCUS { 8, 24, 6, 2, 7, 30, 50, 0 }, // RIDE_TYPE_GHOST_TRAIN { 54, 24, 8, 31, 9, 55, 120, 0 }, // RIDE_TYPE_TWISTER_ROLLER_COASTER { 41, 24, 8, 15, 11, 50, 105, 0 }, // RIDE_TYPE_WOODEN_ROLLER_COASTER { 15, 24, 4, 15, 11, 37, 65, 0 }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { 16, 24, 4, 4, 7, 40, 55, 0 }, // RIDE_TYPE_WILD_MOUSE + { 16, 24, 4, 4, 7, 40, 55, 0 }, // RIDE_TYPE_STEEL_WILD_MOUSE { 40, 24, 8, 78, 11, 50, 100, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER { 40, 24, 8, 78, 11, 50, 100, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT { 30, 24, 8, 35, 11, 50, 100, 0 }, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -1433,7 +1433,7 @@ const money8 DefaultShopItemPrice[SHOP_ITEM_COUNT] = { MONEY(1,50), // SHOP_ITEM_HAT MONEY(0,70), // SHOP_ITEM_TOFFEE_APPLE MONEY(3,00), // SHOP_ITEM_TSHIRT - MONEY(0,70), // SHOP_ITEM_DONUT + MONEY(0,70), // SHOP_ITEM_DOUGHNUT MONEY(1,20), // SHOP_ITEM_COFFEE MONEY(0,00), // SHOP_ITEM_EMPTY_CUP MONEY(1,50), // SHOP_ITEM_CHICKEN @@ -1549,7 +1549,7 @@ const uint32 ShopItemImage[SHOP_ITEM_COUNT] = { SPR_SHOP_ITEM_HAT, SPR_SHOP_ITEM_TOFFEE_APPLE, SPR_SHOP_ITEM_TSHIRT, - SPR_SHOP_ITEM_DONUT, + SPR_SHOP_ITEM_DOUGHNUT, SPR_SHOP_ITEM_COFFEE, SPR_SHOP_ITEM_EMPTY_CUP, SPR_SHOP_ITEM_CHICKEN, @@ -1765,7 +1765,7 @@ const sint32 RidePhotoItems[] = { SHOP_ITEM_PHOTO4, // RIDE_TYPE_LOG_FLUME SHOP_ITEM_PHOTO4, // RIDE_TYPE_RIVER_RAPIDS SHOP_ITEM_PHOTO, // RIDE_TYPE_DODGEMS - SHOP_ITEM_PHOTO, // RIDE_TYPE_PIRATE_SHIP + SHOP_ITEM_PHOTO, // RIDE_TYPE_SWINGING_SHIP SHOP_ITEM_PHOTO, // RIDE_TYPE_SWINGING_INVERTER_SHIP SHOP_ITEM_PHOTO, // RIDE_TYPE_FOOD_STALL SHOP_ITEM_PHOTO, // RIDE_TYPE_1D @@ -1788,12 +1788,12 @@ const sint32 RidePhotoItems[] = { SHOP_ITEM_PHOTO, // RIDE_TYPE_TWIST SHOP_ITEM_PHOTO, // RIDE_TYPE_HAUNTED_HOUSE SHOP_ITEM_PHOTO, // RIDE_TYPE_FIRST_AID - SHOP_ITEM_PHOTO, // RIDE_TYPE_CIRCUS_SHOW + SHOP_ITEM_PHOTO, // RIDE_TYPE_CIRCUS SHOP_ITEM_PHOTO, // RIDE_TYPE_GHOST_TRAIN SHOP_ITEM_PHOTO, // RIDE_TYPE_TWISTER_ROLLER_COASTER SHOP_ITEM_PHOTO3, // RIDE_TYPE_WOODEN_ROLLER_COASTER SHOP_ITEM_PHOTO3, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - SHOP_ITEM_PHOTO, // RIDE_TYPE_WILD_MOUSE + SHOP_ITEM_PHOTO, // RIDE_TYPE_STEEL_WILD_MOUSE SHOP_ITEM_PHOTO2, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER SHOP_ITEM_PHOTO2, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT SHOP_ITEM_PHOTO2, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -1860,7 +1860,7 @@ const rating_tuple RideRatings[RIDE_TYPE_COUNT] = { { 80, 34, 6 }, // RIDE_TYPE_LOG_FLUME { 72, 26, 6 }, // RIDE_TYPE_RIVER_RAPIDS { 40, 20, 0 }, // RIDE_TYPE_DODGEMS - { 50, 30, 10 }, // RIDE_TYPE_PIRATE_SHIP + { 50, 30, 10 }, // RIDE_TYPE_SWINGING_SHIP { 50, 30, 10 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP { 0, 0, 0 }, // RIDE_TYPE_FOOD_STALL { 0, 0, 0 }, // RIDE_TYPE_1D @@ -1883,12 +1883,12 @@ const rating_tuple RideRatings[RIDE_TYPE_COUNT] = { { 40, 20, 10 }, // RIDE_TYPE_TWIST { 20, 10, 0 }, // RIDE_TYPE_HAUNTED_HOUSE { 0, 0, 0 }, // RIDE_TYPE_FIRST_AID - { 20, 10, 0 }, // RIDE_TYPE_CIRCUS_SHOW + { 20, 10, 0 }, // RIDE_TYPE_CIRCUS { 70, 10, 10 }, // RIDE_TYPE_GHOST_TRAIN { 52, 36, 10 }, // RIDE_TYPE_TWISTER_ROLLER_COASTER { 52, 33, 8 }, // RIDE_TYPE_WOODEN_ROLLER_COASTER { 48, 28, 7 }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - { 50, 30, 30 }, // RIDE_TYPE_WILD_MOUSE + { 50, 30, 30 }, // RIDE_TYPE_STEEL_WILD_MOUSE { 50, 30, 10 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER { 50, 30, 10 }, // RIDE_TYPE_38 { 50, 30, 10 }, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -2084,7 +2084,7 @@ const rct_ride_properties RideProperties[RIDE_TYPE_COUNT] = { {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | 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, 25, 0, 0, 0, 0 }, // RIDE_TYPE_PIRATE_SHIP + 7, 25, 0, 0, 0, 0 }, // RIDE_TYPE_SWINGING_SHIP {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_16 | RIDE_TYPE_FLAG_TRACK_NO_WALLS | @@ -2181,7 +2181,7 @@ const rct_ride_properties RideProperties[RIDE_TYPE_COUNT] = { {RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | 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_IN_RIDE | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS, - 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_CIRCUS_SHOW + 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_CIRCUS {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS | RIDE_TYPE_FLAG_HAS_G_FORCES | RIDE_TYPE_FLAG_HAS_DATA_LOGGING | RIDE_TYPE_FLAG_HAS_DROPS | @@ -2215,7 +2215,7 @@ const rct_ride_properties RideProperties[RIDE_TYPE_COUNT] = { RIDE_TYPE_FLAG_HAS_DATA_LOGGING | RIDE_TYPE_FLAG_HAS_DROPS | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_PEEP_WILL_RIDE_AGAIN | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS | RIDE_TYPE_FLAG_CHECK_FOR_STALLING | RIDE_TYPE_FLAG_HAS_TRACK | RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR, - 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_WILD_MOUSE + 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_STEEL_WILD_MOUSE {RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION | RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS | RIDE_TYPE_FLAG_HAS_G_FORCES | @@ -2455,7 +2455,7 @@ const rct_shop_item_stats ShopItemStats[SHOP_ITEM_COUNT] = { { 9, 27, 32, 24 }, // SHOP_ITEM_HAT { 4, 10, 10, 10 }, // SHOP_ITEM_TOFFEE_APPLE { 20, 37, 37, 37 }, // SHOP_ITEM_TSHIRT - { 4, 8, 7, 10 }, // SHOP_ITEM_DONUT + { 4, 8, 7, 10 }, // SHOP_ITEM_DOUGHNUT { 3, 11, 15, 20 }, // SHOP_ITEM_COFFEE { 0, 0, 0, 0 }, // SHOP_ITEM_EMPTY_CUP { 5, 19, 19, 22 }, // SHOP_ITEM_CHICKEN @@ -2518,7 +2518,7 @@ const uint8 RideConstructionDefaultTrackType[] = { TRACK_ELEM_END_STATION, // RIDE_TYPE_LOG_FLUME TRACK_ELEM_END_STATION, // RIDE_TYPE_RIVER_RAPIDS FLAT_TRACK_ELEM_4_X_4, // RIDE_TYPE_DODGEMS - FLAT_TRACK_ELEM_1_X_5, // RIDE_TYPE_PIRATE_SHIP + FLAT_TRACK_ELEM_1_X_5, // RIDE_TYPE_SWINGING_SHIP FLAT_TRACK_ELEM_1_X_4_B, // RIDE_TYPE_SWINGING_INVERTER_SHIP FLAT_TRACK_ELEM_1_X_1_A, // RIDE_TYPE_FOOD_STALL FLAT_TRACK_ELEM_1_X_1_B, // RIDE_TYPE_1D @@ -2541,12 +2541,12 @@ const uint8 RideConstructionDefaultTrackType[] = { FLAT_TRACK_ELEM_3_X_3, // RIDE_TYPE_TWIST FLAT_TRACK_ELEM_3_X_3, // RIDE_TYPE_HAUNTED_HOUSE FLAT_TRACK_ELEM_1_X_1_A, // RIDE_TYPE_FIRST_AID - FLAT_TRACK_ELEM_3_X_3, // RIDE_TYPE_CIRCUS_SHOW + FLAT_TRACK_ELEM_3_X_3, // RIDE_TYPE_CIRCUS TRACK_ELEM_END_STATION, // RIDE_TYPE_GHOST_TRAIN TRACK_ELEM_END_STATION, // RIDE_TYPE_TWISTER_ROLLER_COASTER TRACK_ELEM_END_STATION, // RIDE_TYPE_WOODEN_ROLLER_COASTER TRACK_ELEM_END_STATION, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER - TRACK_ELEM_END_STATION, // RIDE_TYPE_WILD_MOUSE + TRACK_ELEM_END_STATION, // RIDE_TYPE_STEEL_WILD_MOUSE TRACK_ELEM_END_STATION, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER TRACK_ELEM_END_STATION, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT TRACK_ELEM_END_STATION, // RIDE_TYPE_FLYING_ROLLER_COASTER @@ -2784,7 +2784,7 @@ const track_colour_preset_list RideColourPresets[] = { { COLOUR_DARK_GREEN, COLOUR_BLACK, COLOUR_DARK_GREEN }, ), - // RIDE_TYPE_PIRATE_SHIP + // RIDE_TYPE_SWINGING_SHIP TRACK_COLOUR_PRESETS( { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, ), @@ -2876,7 +2876,7 @@ const track_colour_preset_list RideColourPresets[] = { // RIDE_TYPE_FIRST_AID DEFAULT_FLAT_RIDE_COLOUR_PRESET, - // RIDE_TYPE_CIRCUS_SHOW + // RIDE_TYPE_CIRCUS DEFAULT_FLAT_RIDE_COLOUR_PRESET, // RIDE_TYPE_GHOST_TRAIN @@ -2912,7 +2912,7 @@ const track_colour_preset_list RideColourPresets[] = { { COLOUR_DARK_BROWN, COLOUR_LIGHT_BROWN, COLOUR_DARK_BROWN }, ), - // RIDE_TYPE_WILD_MOUSE + // RIDE_TYPE_STEEL_WILD_MOUSE TRACK_COLOUR_PRESETS( { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_YELLOW }, { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_WHITE }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 22dd3daa2e..e96761dbc8 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -78,7 +78,7 @@ enum { SPR_SHOP_ITEM_HAT = 5079, SPR_SHOP_ITEM_TOFFEE_APPLE = 5080, SPR_SHOP_ITEM_TSHIRT = 5081, - SPR_SHOP_ITEM_DONUT = 5082, + SPR_SHOP_ITEM_DOUGHNUT = 5082, SPR_SHOP_ITEM_COFFEE = 5083, SPR_SHOP_ITEM_EMPTY_CUP = 5084, SPR_SHOP_ITEM_CHICKEN = 5085, diff --git a/test/tests/testdata/ratings/bpb.sv6.txt b/test/tests/testdata/ratings/bpb.sv6.txt index 0ae2b70dac..201eabd187 100644 --- a/test/tests/testdata/ratings/bpb.sv6.txt +++ b/test/tests/testdata/ratings/bpb.sv6.txt @@ -91,7 +91,7 @@ RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER: (486, 586, 338) RIDE_TYPE_REVERSER_ROLLER_COASTER: (548, 525, 387) RIDE_TYPE_INVERTED_HAIRPIN_COASTER: (668, 770, 470) RIDE_TYPE_VIRGINIA_REEL: (531, 542, 588) -RIDE_TYPE_WILD_MOUSE: (631, 768, 473) +RIDE_TYPE_STEEL_WILD_MOUSE: (631, 768, 473) RIDE_TYPE_MINI_ROLLER_COASTER: (541, 563, 397) RIDE_TYPE_SPIRAL_ROLLER_COASTER: (613, 373, 215) RIDE_TYPE_LOOPING_ROLLER_COASTER: (467, 441, 182) @@ -116,10 +116,10 @@ RIDE_TYPE_FERRIS_WHEEL: (85, 50, 55) RIDE_TYPE_OBSERVATION_TOWER: (594, 0, 61) RIDE_TYPE_SPIRAL_SLIDE: (157, 140, 90) RIDE_TYPE_SPACE_RINGS: (167, 210, 650) -RIDE_TYPE_CIRCUS_SHOW: (210, 30, 0) +RIDE_TYPE_CIRCUS: (210, 30, 0) RIDE_TYPE_FLYING_SAUCERS: (381, 85, 39) RIDE_TYPE_MAGIC_CARPET: (374, 340, 440) -RIDE_TYPE_PIRATE_SHIP: (264, 245, 251) +RIDE_TYPE_SWINGING_SHIP: (264, 245, 251) RIDE_TYPE_SWINGING_INVERTER_SHIP: (349, 468, 472) RIDE_TYPE_TOP_SPIN: (201, 480, 574) RIDE_TYPE_ROTO_DROP: (395, 1148, 1148)