From 57b50e46df11be47845a96c906b5a560b6c835da Mon Sep 17 00:00:00 2001 From: frutiemax Date: Fri, 19 Jun 2020 17:03:24 -0400 Subject: [PATCH] Part of #11964: Move RideTypeEnumNames to RideTypeDescriptors --- src/openrct2/ride/Ride.cpp | 99 ------------------- src/openrct2/ride/Ride.h | 2 - src/openrct2/ride/RideData.h | 2 + .../coaster/meta/AirPoweredVerticalCoaster.h | 1 + .../ride/coaster/meta/BobsleighCoaster.h | 1 + .../coaster/meta/CompactInvertedCoaster.h | 1 + .../coaster/meta/CorkscrewRollerCoaster.h | 1 + .../ride/coaster/meta/FlyingRollerCoaster.h | 2 + src/openrct2/ride/coaster/meta/GigaCoaster.h | 1 + .../coaster/meta/HeartlineTwisterCoaster.h | 1 + .../coaster/meta/InvertedHairpinCoaster.h | 1 + .../coaster/meta/InvertedImpulseCoaster.h | 1 + .../ride/coaster/meta/InvertedRollerCoaster.h | 1 + .../ride/coaster/meta/JuniorRollerCoaster.h | 1 + .../coaster/meta/LIMLaunchedRollerCoaster.h | 1 + .../ride/coaster/meta/LayDownRollerCoaster.h | 2 + .../ride/coaster/meta/LoopingRollerCoaster.h | 1 + src/openrct2/ride/coaster/meta/MineRide.h | 1 + .../ride/coaster/meta/MineTrainCoaster.h | 1 + .../ride/coaster/meta/MiniRollerCoaster.h | 1 + .../ride/coaster/meta/MiniSuspendedCoaster.h | 1 + .../meta/MultiDimensionRollerCoaster.h | 2 + .../coaster/meta/ReverseFreefallCoaster.h | 1 + .../ride/coaster/meta/ReverserRollerCoaster.h | 1 + .../coaster/meta/SideFrictionRollerCoaster.h | 1 + .../ride/coaster/meta/SpiralRollerCoaster.h | 1 + .../ride/coaster/meta/StandUpRollerCoaster.h | 1 + .../ride/coaster/meta/SteelWildMouse.h | 1 + src/openrct2/ride/coaster/meta/Steeplechase.h | 1 + .../coaster/meta/SuspendedSwingingCoaster.h | 1 + .../ride/coaster/meta/TwisterRollerCoaster.h | 1 + .../ride/coaster/meta/VerticalDropCoaster.h | 1 + src/openrct2/ride/coaster/meta/VirginiaReel.h | 1 + src/openrct2/ride/coaster/meta/WaterCoaster.h | 1 + .../ride/coaster/meta/WoodenRollerCoaster.h | 1 + .../ride/coaster/meta/WoodenWildMouse.h | 1 + src/openrct2/ride/gentle/meta/CarRide.h | 1 + src/openrct2/ride/gentle/meta/Circus.h | 1 + src/openrct2/ride/gentle/meta/CrookedHouse.h | 1 + src/openrct2/ride/gentle/meta/Dodgems.h | 1 + src/openrct2/ride/gentle/meta/FerrisWheel.h | 1 + src/openrct2/ride/gentle/meta/FlyingSaucers.h | 1 + src/openrct2/ride/gentle/meta/GhostTrain.h | 1 + src/openrct2/ride/gentle/meta/HauntedHouse.h | 1 + src/openrct2/ride/gentle/meta/Maze.h | 1 + src/openrct2/ride/gentle/meta/MerryGoRound.h | 1 + src/openrct2/ride/gentle/meta/MiniGolf.h | 1 + .../ride/gentle/meta/MiniHelicopters.h | 1 + .../ride/gentle/meta/MonorailCycles.h | 1 + .../ride/gentle/meta/ObservationTower.h | 1 + src/openrct2/ride/gentle/meta/SpaceRings.h | 1 + src/openrct2/ride/gentle/meta/SpiralSlide.h | 1 + src/openrct2/ride/shops/meta/CashMachine.h | 1 + src/openrct2/ride/shops/meta/DrinkStall.h | 1 + src/openrct2/ride/shops/meta/FirstAid.h | 1 + src/openrct2/ride/shops/meta/FoodStall.h | 1 + .../ride/shops/meta/InformationKiosk.h | 1 + src/openrct2/ride/shops/meta/Shop.h | 1 + src/openrct2/ride/shops/meta/Toilets.h | 1 + src/openrct2/ride/thrill/meta/3DCinema.h | 1 + src/openrct2/ride/thrill/meta/Enterprise.h | 1 + src/openrct2/ride/thrill/meta/GoKarts.h | 1 + .../ride/thrill/meta/LaunchedFreefall.h | 1 + src/openrct2/ride/thrill/meta/MagicCarpet.h | 1 + .../ride/thrill/meta/MotionSimulator.h | 1 + src/openrct2/ride/thrill/meta/RotoDrop.h | 1 + .../ride/thrill/meta/SwingingInverterShip.h | 1 + src/openrct2/ride/thrill/meta/SwingingShip.h | 1 + src/openrct2/ride/thrill/meta/TopSpin.h | 1 + src/openrct2/ride/thrill/meta/Twist.h | 1 + src/openrct2/ride/transport/meta/Chairlift.h | 1 + src/openrct2/ride/transport/meta/Lift.h | 1 + .../ride/transport/meta/MiniatureRailway.h | 1 + src/openrct2/ride/transport/meta/Monorail.h | 1 + .../ride/transport/meta/SuspendedMonorail.h | 1 + src/openrct2/ride/water/meta/BoatHire.h | 1 + src/openrct2/ride/water/meta/DinghySlide.h | 1 + src/openrct2/ride/water/meta/LogFlume.h | 1 + src/openrct2/ride/water/meta/RiverRafts.h | 1 + src/openrct2/ride/water/meta/RiverRapids.h | 1 + src/openrct2/ride/water/meta/SplashBoats.h | 1 + src/openrct2/ride/water/meta/SubmarineRide.h | 1 + test/tests/RideRatings.cpp | 3 +- 83 files changed, 86 insertions(+), 102 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 1f7381ea12..f7f048eea6 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -7317,105 +7317,6 @@ bool ride_has_ratings(const Ride* ride) return ride->excitement != RIDE_RATING_UNDEFINED; } -const char* ride_type_get_enum_name(int32_t rideType) -{ - static constexpr const char* RideTypeEnumNames[RIDE_TYPE_COUNT] = { - nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER), - nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER), - nameof(RIDE_TYPE_SUSPENDED_SWINGING_COASTER), - nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER), - nameof(RIDE_TYPE_JUNIOR_ROLLER_COASTER), - nameof(RIDE_TYPE_MINIATURE_RAILWAY), - nameof(RIDE_TYPE_MONORAIL), - nameof(RIDE_TYPE_MINI_SUSPENDED_COASTER), - nameof(RIDE_TYPE_BOAT_HIRE), - nameof(RIDE_TYPE_WOODEN_WILD_MOUSE), - nameof(RIDE_TYPE_STEEPLECHASE), - nameof(RIDE_TYPE_CAR_RIDE), - nameof(RIDE_TYPE_LAUNCHED_FREEFALL), - nameof(RIDE_TYPE_BOBSLEIGH_COASTER), - nameof(RIDE_TYPE_OBSERVATION_TOWER), - nameof(RIDE_TYPE_LOOPING_ROLLER_COASTER), - nameof(RIDE_TYPE_DINGHY_SLIDE), - nameof(RIDE_TYPE_MINE_TRAIN_COASTER), - nameof(RIDE_TYPE_CHAIRLIFT), - nameof(RIDE_TYPE_CORKSCREW_ROLLER_COASTER), - nameof(RIDE_TYPE_MAZE), - nameof(RIDE_TYPE_SPIRAL_SLIDE), - nameof(RIDE_TYPE_GO_KARTS), - nameof(RIDE_TYPE_LOG_FLUME), - nameof(RIDE_TYPE_RIVER_RAPIDS), - nameof(RIDE_TYPE_DODGEMS), - nameof(RIDE_TYPE_SWINGING_SHIP), - nameof(RIDE_TYPE_SWINGING_INVERTER_SHIP), - nameof(RIDE_TYPE_FOOD_STALL), - nameof(RIDE_TYPE_1D), - nameof(RIDE_TYPE_DRINK_STALL), - nameof(RIDE_TYPE_1F), - nameof(RIDE_TYPE_SHOP), - nameof(RIDE_TYPE_MERRY_GO_ROUND), - nameof(RIDE_TYPE_22), - nameof(RIDE_TYPE_INFORMATION_KIOSK), - nameof(RIDE_TYPE_TOILETS), - nameof(RIDE_TYPE_FERRIS_WHEEL), - nameof(RIDE_TYPE_MOTION_SIMULATOR), - nameof(RIDE_TYPE_3D_CINEMA), - nameof(RIDE_TYPE_TOP_SPIN), - nameof(RIDE_TYPE_SPACE_RINGS), - nameof(RIDE_TYPE_REVERSE_FREEFALL_COASTER), - nameof(RIDE_TYPE_LIFT), - nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER), - nameof(RIDE_TYPE_CASH_MACHINE), - nameof(RIDE_TYPE_TWIST), - nameof(RIDE_TYPE_HAUNTED_HOUSE), - nameof(RIDE_TYPE_FIRST_AID), - 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_STEEL_WILD_MOUSE), - nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER), - nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT), - nameof(RIDE_TYPE_FLYING_ROLLER_COASTER), - nameof(RIDE_TYPE_FLYING_ROLLER_COASTER_ALT), - nameof(RIDE_TYPE_VIRGINIA_REEL), - nameof(RIDE_TYPE_SPLASH_BOATS), - nameof(RIDE_TYPE_MINI_HELICOPTERS), - nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER), - nameof(RIDE_TYPE_SUSPENDED_MONORAIL), - nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT), - nameof(RIDE_TYPE_REVERSER_ROLLER_COASTER), - nameof(RIDE_TYPE_HEARTLINE_TWISTER_COASTER), - nameof(RIDE_TYPE_MINI_GOLF), - nameof(RIDE_TYPE_GIGA_COASTER), - nameof(RIDE_TYPE_ROTO_DROP), - nameof(RIDE_TYPE_FLYING_SAUCERS), - nameof(RIDE_TYPE_CROOKED_HOUSE), - nameof(RIDE_TYPE_MONORAIL_CYCLES), - nameof(RIDE_TYPE_COMPACT_INVERTED_COASTER), - nameof(RIDE_TYPE_WATER_COASTER), - nameof(RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER), - nameof(RIDE_TYPE_INVERTED_HAIRPIN_COASTER), - nameof(RIDE_TYPE_MAGIC_CARPET), - nameof(RIDE_TYPE_SUBMARINE_RIDE), - nameof(RIDE_TYPE_RIVER_RAFTS), - nameof(RIDE_TYPE_50), - nameof(RIDE_TYPE_ENTERPRISE), - nameof(RIDE_TYPE_52), - nameof(RIDE_TYPE_53), - nameof(RIDE_TYPE_54), - nameof(RIDE_TYPE_55), - nameof(RIDE_TYPE_INVERTED_IMPULSE_COASTER), - nameof(RIDE_TYPE_MINI_ROLLER_COASTER), - nameof(RIDE_TYPE_MINE_RIDE), - nameof(RIDE_TYPE_59), - nameof(RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER), - }; - - return RideTypeEnumNames[rideType]; -} - /** * Searches for a non-null ride type in a ride entry. * If none is found, it will still return RIDE_TYPE_NULL. diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 3e3625580b..c3c0418cd9 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -1208,8 +1208,6 @@ bool ride_has_adjacent_station(Ride* ride); bool ride_has_station_shelter(Ride* ride); bool ride_has_ratings(const Ride* ride); -const char* ride_type_get_enum_name(int32_t rideType); - uint8_t ride_entry_get_first_non_null_ride_type(const rct_ride_entry* rideEntry); int32_t get_booster_speed(uint8_t rideType, int32_t rawSpeed); void fix_invalid_vehicle_sprite_sizes(); diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index c93db1daa4..9dd23591da 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -141,6 +141,7 @@ struct RideTypeDescriptor RideOperatingSettings OperatingSettings; RideNaming Naming; RideNameConvention NameConvention; + const char* EnumName; uint8_t AvailableBreakdowns; /** rct2: 0x0097D218 */ RideHeights Heights; @@ -318,6 +319,7 @@ constexpr const RideTypeDescriptor DummyRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_UNKNOWN_RIDE, STR_RIDE_DESCRIPTION_UNKNOWN }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, "(INVALID)"), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 64, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h index cc7fa3b8f1..b9296dc384 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -29,6 +29,7 @@ constexpr const RideTypeDescriptor AirPoweredVerticalCoasterRTD = SET_FIELD(OperatingSettings, { 30, 50, 30, 40, 40, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_AIR_POWERED_VERTICAL_COASTER, STR_RIDE_DESCRIPTION_AIR_POWERED_VERTICAL_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 32, 4, 7, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index da1cf318cb..1ab214b615 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_BOBSLEIGH_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 19, 24, 5, 7, }), SET_FIELD(MaxMass, 25), diff --git a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index 644a061f36..a2dde1ae91 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD = SET_FIELD(OperatingSettings, { 7, 27, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_COMPACT_INVERTED_COASTER, STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_COMPACT_INVERTED_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 27, 40, 29, 8, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index d06a867175..44d52a8d60 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_CORKSCREW_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CORKSCREW_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_CORKSCREW_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 28, 24, 8, 11, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h index 6c6b7d7abd..f90cb26b7d 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_FLYING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_FLYING_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_FLYING_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 30, 24, 8, 11, }), SET_FIELD(MaxMass, 35), @@ -71,6 +72,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterAltRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_3A, STR_RIDE_DESCRIPTION_UNKNOWN }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_FLYING_ROLLER_COASTER_ALT)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 30, 24, 8, 11, }), SET_FIELD(MaxMass, 35), diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index 120714cc76..002c05859b 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor GigaCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 17, 68, 1 }), SET_FIELD(Naming, { STR_RIDE_NAME_GIGA_COASTER, STR_RIDE_DESCRIPTION_GIGA_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_GIGA_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 86, 24, 9, 11, }), SET_FIELD(MaxMass, 31), diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h index 246289160f..df8e52dcd1 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -30,6 +30,7 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_HEARTLINE_TWISTER_COASTER, STR_RIDE_DESCRIPTION_HEARTLINE_TWISTER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_HEARTLINE_TWISTER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 22, 24, 15, 9, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index 4f940064a0..8771f64097 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER, STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_INVERTED_HAIRPIN_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 16, 24, 24, 7, }), SET_FIELD(MaxMass, 4), diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index d09aaf23e4..5fdc980de9 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD = SET_FIELD(OperatingSettings, { 10, 33, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_INVERTED_IMPULSE_COASTER, STR_RIDE_DESCRIPTION_INVERTED_IMPULSE_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_INVERTED_IMPULSE_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 45, 40, 29, 8, }), SET_FIELD(MaxMass, 23), diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index 8e1ed4c888..b90ebb691e 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(OperatingSettings, { 7, 27, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_INVERTED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_INVERTED_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 38, 40, 29, 8, }), SET_FIELD(MaxMass, 27), diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h index 8e800ba0e8..88e1886f1e 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 17, 16, -1 }), SET_FIELD(Naming, { STR_RIDE_NAME_JUNIOR_ROLLER_COASTER, STR_RIDE_DESCRIPTION_JUNIOR_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_JUNIOR_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 15, 24, 4, 7, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h index 5f9d466bff..df44a7f1d3 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 31, 26, 18, 18, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_LIM_LAUNCHED_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LIM_LAUNCHED_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 35, 24, 5, 7, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h index cfc93b292e..b3a4ed05c5 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_LAY_DOWN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LAY_DOWN_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 26, 24, 8, 11, }), SET_FIELD(MaxMass, 25), @@ -67,6 +68,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_40, STR_RIDE_DESCRIPTION_UNKNOWN }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 26, 24, 8, 11, }), SET_FIELD(MaxMass, 25), diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 00865b8a2e..9305388762 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 26, 18, 18, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_LOOPING_ROLLER_COASTER, STR_RIDE_DESCRIPTION_LOOPING_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LOOPING_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 35, 24, 5, 7, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 6f679cd986..94fdaa01ec 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor MineRideRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINE_RIDE, STR_RIDE_DESCRIPTION_MINE_RIDE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINE_RIDE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 13, 24, 9, 11, }), SET_FIELD(MaxMass, 27), diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index d3bf934232..07a56d9fc7 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINE_TRAIN_COASTER, STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINE_TRAIN_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 21, 24, 4, 7, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index 0bb3d93a7e..f9cc047fa7 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 68, 1 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINI_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 16, 24, 9, 11, }), SET_FIELD(MaxMass, 10), diff --git a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index 2e97294928..83335163ae 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINI_SUSPENDED_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 10, 24, 24, 8, }), SET_FIELD(MaxMass, 3), diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index e5f7e44509..6bea352eb8 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MULTI_DIMENSION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MULTI_DIMENSION_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 40, 24, 8, 11, }), SET_FIELD(MaxMass, 78), @@ -68,6 +69,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 25, 25, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_38, STR_RIDE_DESCRIPTION_UNKNOWN }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 40, 24, 8, 11, }), SET_FIELD(MaxMass, 78), diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index 7346f171cc..f9028e9377 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -29,6 +29,7 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD = SET_FIELD(OperatingSettings, { 7, 30, 30, 40, 40, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_REVERSE_FREEFALL_COASTER, STR_RIDE_DESCRIPTION_REVERSE_FREEFALL_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_REVERSE_FREEFALL_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 32, 4, 7, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index 80d5528754..593e64539d 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -30,6 +30,7 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_REVERSER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_REVERSER_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 18, 24, 8, 11, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index e6862e203d..ecda50c843 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 15, 24, 4, 11, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index 97565f5958..6453e9e5b1 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 17, 17, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SPIRAL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SPIRAL_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 19, 24, 9, 11, }), SET_FIELD(MaxMass, 31), diff --git a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index 3c74e726f3..91a94f949e 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD = SET_FIELD(OperatingSettings, { 7, 27, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 25, 24, 9, 11, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index 50d741e93c..c8f0fd8d99 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor SteelWildMouseRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_STEEL_WILD_MOUSE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 16, 24, 4, 7, }), SET_FIELD(MaxMass, 4), diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index 9ffb108432..65073586fa 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor SteeplechaseRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_STEEPLECHASE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 14, 24, 7, 7, }), SET_FIELD(MaxMass, 4), diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index 613772719c..b21aa95015 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER, STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SUSPENDED_SWINGING_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 24, 40, 29, 8, }), SET_FIELD(MaxMass, 26), diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index 867b753898..799ea36409 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor TwisterRollerCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 30, 17, 68, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_TWISTER_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_TWISTER_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 54, 24, 8, 9, }), SET_FIELD(MaxMass, 31), diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index 3401fa4272..73a0de64bc 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD = SET_FIELD(OperatingSettings, { 10, 27, 26, 17, 68, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_VERTICAL_DROP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_VERTICAL_DROP_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 53, 24, 8, 11, }), SET_FIELD(MaxMass, 25), diff --git a/src/openrct2/ride/coaster/meta/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index e53699f8bc..24a5e12765 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -30,6 +30,7 @@ constexpr const RideTypeDescriptor VirginiaReelRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_VIRGINIA_REEL)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 14, 24, 6, 7, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index ce1daec340..427378b60a 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor WaterCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 17, 16, -1 }), SET_FIELD(Naming, { STR_RIDE_NAME_WATER_COASTER, STR_RIDE_DESCRIPTION_WATER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_WATER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 18, 24, 4, 7, }), SET_FIELD(MaxMass, 13), diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index 8c2f7e4526..6578371182 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_WOODEN_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 41, 24, 8, 11, }), SET_FIELD(MaxMass, 19), diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index ddb105bd48..7d35e45b73 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor WoodenWildMouseRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_WOODEN_WILD_MOUSE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), SET_FIELD(Heights, { 14, 24, 4, 7, }), SET_FIELD(MaxMass, 4), diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index ed483587c9..6d78d23e83 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor CarRideRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_CAR_RIDE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 6, 24, 4, 7, }), SET_FIELD(MaxMass, 2), diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 217c3c4be2..c3c12a76ea 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_CIRCUS_SHOW, STR_RIDE_DESCRIPTION_CIRCUS_SHOW }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_CIRCUS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 128, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index eb0f909834..41face1820 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor CrookedHouseRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_CROOKED_HOUSE, STR_RIDE_DESCRIPTION_CROOKED_HOUSE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_CROOKED_HOUSE)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 16, 96, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index fc453e5bf7..b7a803a11b 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor DodgemsRTD = SET_FIELD(OperatingSettings, { 20, 180, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_DODGEMS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 9, 48, 2, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index 3962b10c7f..814b661e19 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor FerrisWheelRTD = SET_FIELD(OperatingSettings, { 1, 3, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_WHEEL, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_FERRIS_WHEEL)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 16, 176, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index 84a46a91d3..110ba580cb 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD = SET_FIELD(OperatingSettings, { 20, 180, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_FLYING_SAUCERS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 9, 48, 2, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index c4c051fdf5..9c42c7e906 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor GhostTrainRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_GHOST_TRAIN)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 8, 24, 6, 7, }), SET_FIELD(MaxMass, 2), diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index 6a0a59bc00..6afa7fa01c 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor HauntedHouseRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_HAUNTED_HOUSE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 16, 160, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index b54647da06..e6aa0106ea 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -30,6 +30,7 @@ constexpr const RideTypeDescriptor MazeRTD = SET_FIELD(OperatingSettings, { 1, 64, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MAZE)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 6, 24, 0, 1, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index 2b5a3de5a1..4c8ff73555 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor MerryGoRoundRTD = SET_FIELD(OperatingSettings, { 4, 25, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MERRY_GO_ROUND, STR_RIDE_DESCRIPTION_MERRY_GO_ROUND }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MERRY_GO_ROUND)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(Heights, { 12, 64, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index 2f8dda8aab..d81c1e6c67 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor MiniGolfRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_PLAYER, RIDE_COMPONENT_TYPE_COURSE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINI_GOLF)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 7, 32, 2, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index a162ff4073..b419cdfe37 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor MiniHelicoptersRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINI_HELICOPTERS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 7, 24, 4, 7, }), SET_FIELD(MaxMass, 2), diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index a0d9e22c19..e54395a3fb 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor MonorailCyclesRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MONORAIL_CYCLES)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 5, 24, 8, 7, }), SET_FIELD(MaxMass, 2), diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index 0b6d6ea1c1..5e7810d585 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor ObservationTowerRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CABIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_OBSERVATION_TOWER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 32, 3, 2, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index f8cfb00ab1..25cb3911a6 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor SpaceRingsRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_RING, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SPACE_RINGS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 16, 48, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index 8cf59cf8f8..b890fa9e83 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor SpiralSlideRTD = SET_FIELD(OperatingSettings, { 1, 5, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SPIRAL_SLIDE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 15, 128, 0, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index 36aeb3bb87..9cb6fb25d8 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -30,6 +30,7 @@ constexpr const RideTypeDescriptor CashMachineRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_CASH_MACHINE)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 32, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index 9483d32dc5..f46bf77789 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor DrinkStallRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_DRINK_STALL, STR_RIDE_DESCRIPTION_DRINK_STALL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_DRINK_STALL)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 64, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index c4beff8b39..6cee43d520 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor FirstAidRTD = SET_FIELD(OperatingSettings, { 8, 8, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_FIRST_AID)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 48, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index 02d92e5a4f..d80b22bb85 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor FoodStallRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_FOOD_STALL)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 64, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index 693369680d..ed01914f4a 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor InformationKioskRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_INFORMATION_KIOSK, STR_RIDE_DESCRIPTION_INFORMATION_KIOSK }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_INFORMATION_KIOSK)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 48, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index b97f0882d3..38e03cd58c 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor ShopRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SHOP)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 64, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index fa472866ca..54010b40ee 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor ToiletsRTD = SET_FIELD(OperatingSettings, { 4, 4, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_TOILETS)), SET_FIELD(AvailableBreakdowns, 0), SET_FIELD(Heights, { 12, 32, 0, 0, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index 3cbacc2970..aacf9174dd 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor CinemaRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_3D_CINEMA)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 128, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index 545b1855a7..0a17b00216 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor EnterpriseRTD = SET_FIELD(OperatingSettings, { 10, 20, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_WHEEL, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_ENTERPRISE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 16, 160, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index 54b14108c3..9c1cfb55af 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor GoKartsRTD = SET_FIELD(OperatingSettings, { 1, 10, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_GO_KARTS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 7, 24, 2, 1, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index 8035020d2b..a6f9337bc9 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor LaunchedFreefallRTD = SET_FIELD(OperatingSettings, { 10, 40, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LAUNCHED_FREEFALL)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 32, 3, 2, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index 642808406e..37b6d217f5 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor MagicCarpetRTD = SET_FIELD(OperatingSettings, { 7, 15, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MAGIC_CARPET)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 15, 176, 7, 11, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index 5abf25f42a..663cd44979 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor MotionSimulatorRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MOTION_SIMULATOR)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 64, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index be1d1c319a..f33428a35a 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor RotoDropRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_ROTO_DROP)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 32, 3, 2, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index 880978cdaf..2e2d90d076 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor SwingingInverterShipRTD = SET_FIELD(OperatingSettings, { 7, 15, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_SHIP, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SWINGING_INVERTER_SHIP)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 15, 176, 7, 11, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index 9ad1e4f3c9..ed43f820b9 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(OperatingSettings, { 7, 25, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_PIRATE_SHIP, STR_RIDE_DESCRIPTION_PIRATE_SHIP }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_SHIP, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SWINGING_SHIP)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 112, 7, 11, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index 45d737d836..d299313c18 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor TopSpinRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_TOP_SPIN)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 16, 112, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index e7fb155593..bf3735e7d3 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor TwistRTD = SET_FIELD(OperatingSettings, { 3, 6, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_TWIST)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 64, 3, 2, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index 95ad86f2d7..b6c10a4a06 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor ChairliftRTD = SET_FIELD(OperatingSettings, { 1, 4, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_CHAIRLIFT)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 40, 32, 28, 2, }), SET_FIELD(MaxMass, 18), diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index 1461b5278f..87219850a7 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -32,6 +32,7 @@ constexpr const RideTypeDescriptor LiftRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CABIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LIFT)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 32, 3, 2, }), SET_FIELD(MaxMass, 15), diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index 2fcfa89e07..91ba5d3a2b 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor MiniatureRailwayRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MINIATURE_RAILWAY)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 7, 32, 5, 9, }), SET_FIELD(MaxMass, 39), diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index cc3f75e52b..8169e6aa92 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor MonorailRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_MONORAIL)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 8, 32, 8, 9, }), SET_FIELD(MaxMass, 78), diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index bd22177de1..d717c31e0f 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -35,6 +35,7 @@ constexpr const RideTypeDescriptor SuspendedMonorailRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SUSPENDED_MONORAIL, STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SUSPENDED_MONORAIL)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 12, 40, 32, 8, }), SET_FIELD(MaxMass, 78), diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index 61e8ede5f4..b212a2450c 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -31,6 +31,7 @@ constexpr const RideTypeDescriptor BoatHireRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_BOAT_HIRE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 16, 0, 3, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index 46544972be..a6835829e6 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -43,6 +43,7 @@ constexpr const RideTypeDescriptor DinghySlideRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_DINGHY_SLIDE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 15, 24, 5, 7, }), SET_FIELD(MaxMass, 5), diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 7d18aba976..0eeb1a78f3 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor LogFlumeRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_LOG_FLUME)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(Heights, { 9, 24, 7, 9, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index 2908fc410a..bf5d7ede6e 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor RiverRaftsRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_RIVER_RAFTS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 24, 7, 11, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index d8008e1599..3074102396 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -35,6 +35,7 @@ constexpr const RideTypeDescriptor RiverRapidsRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_RIVER_RAPIDS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(Heights, { 9, 32, 14, 15, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index db13a00d63..5d5a645a31 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -34,6 +34,7 @@ constexpr const RideTypeDescriptor SplashBoatsRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SPLASH_BOATS)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)), SET_FIELD(Heights, { 16, 24, 7, 11, }), SET_FIELD(MaxMass, 255), diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index ef352f2775..b759c50de1 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -33,6 +33,7 @@ constexpr const RideTypeDescriptor SubmarineRideRTD = SET_FIELD(OperatingSettings, { 0, 0, 0, 0, 0, 0 }), SET_FIELD(Naming, { STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM }), + SET_FIELD(EnumName, nameof(RIDE_TYPE_SUBMARINE_RIDE)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION)), SET_FIELD(Heights, { 255, 16, 0, 3, }), SET_FIELD(MaxMass, 255), diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp index e6a937eaee..a43f4e7bad 100644 --- a/test/tests/RideRatings.cpp +++ b/test/tests/RideRatings.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include using namespace OpenRCT2; @@ -47,7 +48,7 @@ protected: { RatingTuple ratings = ride.ratings; std::string line = String::StdFormat( - "%s: (%d, %d, %d)", ride_type_get_enum_name(ride.type), (int)ratings.Excitement, (int)ratings.Intensity, + "%s: (%d, %d, %d)", RideTypeDescriptors[ride.type].EnumName, (int)ratings.Excitement, (int)ratings.Intensity, (int)ratings.Nausea); return line; }