From 9778d7b0ba070d3b5cdaed0a5ff8fc1a95d3b975 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 6 Mar 2025 22:41:24 +0100 Subject: [PATCH] Create strong enum for RideCategory --- .../windows/EditorObjectSelection.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 4 ++-- src/openrct2-ui/windows/RideConstruction.cpp | 4 ++-- src/openrct2/management/Award.cpp | 6 ++--- src/openrct2/object/ObjectRepository.cpp | 5 ++++- src/openrct2/object/ObjectRepository.h | 3 ++- src/openrct2/object/RideObject.cpp | 22 +++++++++---------- src/openrct2/object/RideObject.h | 4 +++- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/Ride.h | 18 +++++++-------- src/openrct2/ride/RideData.cpp | 14 ++++++------ src/openrct2/ride/RideData.h | 4 ++-- .../rtd/coaster/AirPoweredVerticalCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/AlpineCoaster.h | 2 +- .../ride/rtd/coaster/BobsleighCoaster.h | 2 +- .../rtd/coaster/ClassicMiniRollerCoaster.h | 2 +- .../rtd/coaster/ClassicStandUpRollerCoaster.h | 2 +- .../rtd/coaster/ClassicWoodenRollerCoaster.h | 2 +- .../ClassicWoodenTwisterRollerCoaster.h | 2 +- .../ride/rtd/coaster/CompactInvertedCoaster.h | 2 +- .../ride/rtd/coaster/CorkscrewRollerCoaster.h | 2 +- .../ride/rtd/coaster/FlyingRollerCoaster.h | 4 ++-- src/openrct2/ride/rtd/coaster/GigaCoaster.h | 2 +- .../rtd/coaster/HeartlineTwisterCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/HybridCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/HyperTwister.h | 2 +- src/openrct2/ride/rtd/coaster/Hypercoaster.h | 2 +- .../ride/rtd/coaster/InvertedHairpinCoaster.h | 2 +- .../ride/rtd/coaster/InvertedImpulseCoaster.h | 2 +- .../ride/rtd/coaster/InvertedRollerCoaster.h | 2 +- .../ride/rtd/coaster/JuniorRollerCoaster.h | 2 +- .../rtd/coaster/LIMLaunchedRollerCoaster.h | 2 +- .../rtd/coaster/LSMLaunchedRollerCoaster.h | 2 +- .../ride/rtd/coaster/LayDownRollerCoaster.h | 4 ++-- .../ride/rtd/coaster/LoopingRollerCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/MineRide.h | 2 +- .../ride/rtd/coaster/MineTrainCoaster.h | 2 +- .../ride/rtd/coaster/MiniRollerCoaster.h | 2 +- .../ride/rtd/coaster/MiniSuspendedCoaster.h | 2 +- .../rtd/coaster/MultiDimensionRollerCoaster.h | 4 ++-- .../ride/rtd/coaster/ReverseFreefallCoaster.h | 2 +- .../ride/rtd/coaster/ReverserRollerCoaster.h | 2 +- .../rtd/coaster/SideFrictionRollerCoaster.h | 2 +- .../rtd/coaster/SingleRailRollerCoaster.h | 2 +- .../ride/rtd/coaster/SpinningWildMouse.h | 2 +- .../ride/rtd/coaster/SpiralRollerCoaster.h | 2 +- .../ride/rtd/coaster/StandUpRollerCoaster.h | 2 +- .../ride/rtd/coaster/SteelWildMouse.h | 2 +- src/openrct2/ride/rtd/coaster/Steeplechase.h | 2 +- .../rtd/coaster/SuspendedSwingingCoaster.h | 2 +- .../ride/rtd/coaster/TwisterRollerCoaster.h | 2 +- .../ride/rtd/coaster/VerticalDropCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/VirginiaReel.h | 2 +- src/openrct2/ride/rtd/coaster/WaterCoaster.h | 2 +- .../ride/rtd/coaster/WoodenRollerCoaster.h | 2 +- .../ride/rtd/coaster/WoodenWildMouse.h | 2 +- src/openrct2/ride/rtd/gentle/CarRide.h | 2 +- src/openrct2/ride/rtd/gentle/Circus.h | 2 +- src/openrct2/ride/rtd/gentle/CrookedHouse.h | 2 +- src/openrct2/ride/rtd/gentle/Dodgems.h | 2 +- src/openrct2/ride/rtd/gentle/FerrisWheel.h | 2 +- src/openrct2/ride/rtd/gentle/FlyingSaucers.h | 2 +- src/openrct2/ride/rtd/gentle/GhostTrain.h | 2 +- src/openrct2/ride/rtd/gentle/HauntedHouse.h | 2 +- src/openrct2/ride/rtd/gentle/Maze.h | 2 +- src/openrct2/ride/rtd/gentle/MerryGoRound.h | 2 +- src/openrct2/ride/rtd/gentle/MiniGolf.h | 2 +- .../ride/rtd/gentle/MiniHelicopters.h | 2 +- src/openrct2/ride/rtd/gentle/MonorailCycles.h | 2 +- src/openrct2/ride/rtd/gentle/MonsterTrucks.h | 2 +- .../ride/rtd/gentle/ObservationTower.h | 2 +- src/openrct2/ride/rtd/gentle/SpaceRings.h | 2 +- src/openrct2/ride/rtd/gentle/SpiralSlide.h | 2 +- src/openrct2/ride/rtd/shops/CashMachine.h | 2 +- src/openrct2/ride/rtd/shops/DrinkStall.h | 2 +- src/openrct2/ride/rtd/shops/FirstAid.h | 2 +- src/openrct2/ride/rtd/shops/FoodStall.h | 2 +- .../ride/rtd/shops/InformationKiosk.h | 2 +- src/openrct2/ride/rtd/shops/Shop.h | 2 +- src/openrct2/ride/rtd/shops/Toilets.h | 2 +- src/openrct2/ride/rtd/thrill/3DCinema.h | 2 +- src/openrct2/ride/rtd/thrill/Enterprise.h | 2 +- src/openrct2/ride/rtd/thrill/GoKarts.h | 2 +- .../ride/rtd/thrill/LaunchedFreefall.h | 2 +- src/openrct2/ride/rtd/thrill/MagicCarpet.h | 2 +- .../ride/rtd/thrill/MotionSimulator.h | 2 +- src/openrct2/ride/rtd/thrill/RotoDrop.h | 2 +- .../ride/rtd/thrill/SwingingInverterShip.h | 2 +- src/openrct2/ride/rtd/thrill/SwingingShip.h | 2 +- src/openrct2/ride/rtd/thrill/TopSpin.h | 2 +- src/openrct2/ride/rtd/thrill/Twist.h | 2 +- src/openrct2/ride/rtd/transport/Chairlift.h | 2 +- src/openrct2/ride/rtd/transport/Lift.h | 2 +- .../ride/rtd/transport/MiniatureRailway.h | 2 +- src/openrct2/ride/rtd/transport/Monorail.h | 2 +- .../ride/rtd/transport/SuspendedMonorail.h | 2 +- src/openrct2/ride/rtd/water/BoatHire.h | 2 +- src/openrct2/ride/rtd/water/DinghySlide.h | 2 +- src/openrct2/ride/rtd/water/LogFlume.h | 2 +- src/openrct2/ride/rtd/water/RiverRafts.h | 2 +- src/openrct2/ride/rtd/water/RiverRapids.h | 2 +- src/openrct2/ride/rtd/water/SplashBoats.h | 2 +- src/openrct2/ride/rtd/water/SubmarineRide.h | 2 +- src/openrct2/scenario/Scenario.cpp | 8 +++---- 104 files changed, 145 insertions(+), 139 deletions(-) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 83bcef07ae..e1ee3028d4 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -1522,7 +1522,7 @@ namespace OpenRCT2::Ui::Windows break; } } - return (_filterFlags & (1 << (GetRideTypeDescriptor(rideType).Category + _numSourceGameItems))) != 0; + return (_filterFlags & (1 << (EnumValue(GetRideTypeDescriptor(rideType).Category) + _numSourceGameItems))) != 0; } return true; } diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 1418662157..17be1057f7 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -659,7 +659,7 @@ namespace OpenRCT2::Ui::Windows if (rideType == kRideTypeNull) continue; - if (GetRideTypeDescriptor(rideType).Category != currentCategory) + if (EnumValue(GetRideTypeDescriptor(rideType).Category) != currentCategory) continue; nextListItem = IterateOverRideType(rideType, nextListItem, listEnd); @@ -1113,6 +1113,6 @@ namespace OpenRCT2::Ui::Windows return; auto rideTypeIndex = rideEntry->GetFirstNonNullRideType(); - w->SetPage(GetRideTypeDescriptor(rideTypeIndex).Category); + w->SetPage(EnumValue(GetRideTypeDescriptor(rideTypeIndex).Category)); } } // namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 7fb5d2bd86..d2e9d22376 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1547,7 +1547,7 @@ namespace OpenRCT2::Ui::Windows const auto& rtd = currentRide->GetRideTypeDescriptor(); const auto& ted = GetTrackElementDescriptor(_currentlySelectedTrack.trackType); stringId = ted.description; - if (stringId == STR_RAPIDS && rtd.Category != RIDE_CATEGORY_WATER) + if (stringId == STR_RAPIDS && rtd.Category != RideCategory::water) { stringId = STR_LOG_BUMPS; } @@ -2549,7 +2549,7 @@ namespace OpenRCT2::Ui::Windows if (currentRide != nullptr) { const auto& rtd = currentRide->GetRideTypeDescriptor(); - if (rtd.Category != RIDE_CATEGORY_WATER) + if (rtd.Category != RideCategory::water) trackPieceStringId = STR_LOG_BUMPS; } } diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index a599f8278e..8fb63a9fc8 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -153,7 +153,7 @@ static bool AwardIsDeservedBestRollercoasters([[maybe_unused]] int32_t activeAwa continue; } - if (!RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER)) + if (!RideEntryHasCategory(*rideEntry, RideCategory::rollerCoaster)) { continue; } @@ -444,7 +444,7 @@ static bool AwardIsDeservedBestWaterRides([[maybe_unused]] int32_t activeAwardTy continue; } - if (!RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_WATER)) + if (!RideEntryHasCategory(*rideEntry, RideCategory::water)) { continue; } @@ -551,7 +551,7 @@ static bool AwardIsDeservedBestGentleRides([[maybe_unused]] int32_t activeAwardT continue; } - if (!RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_GENTLE)) + if (!RideEntryHasCategory(*rideEntry, RideCategory::gentle)) { continue; } diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 9df16b144d..6dbc2be0a0 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -149,7 +149,10 @@ protected: { case ObjectType::ride: ds << item.RideInfo.RideFlags; - ds << item.RideInfo.RideCategory; + for (size_t i = 0; i < std::size(item.RideInfo.rideCategory); i++) + { + ds << item.RideInfo.rideCategory[i]; + } ds << item.RideInfo.RideType; break; case ObjectType::sceneryGroup: diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index 4251fb4096..5fb0a5b905 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -22,6 +22,7 @@ namespace OpenRCT2 } // namespace OpenRCT2 class Object; +enum class RideCategory : uint8_t; namespace OpenRCT2::Localisation { @@ -52,7 +53,7 @@ struct ObjectRepositoryItem struct { uint8_t RideFlags; - uint8_t RideCategory[OpenRCT2::RCT2::ObjectLimits::kMaxCategoriesPerRide]; + RideCategory rideCategory[OpenRCT2::RCT2::ObjectLimits::kMaxCategoriesPerRide]; ride_type_t RideType[OpenRCT2::RCT2::ObjectLimits::kMaxRideTypesPerRideEntry]; } RideInfo; struct diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 2d88bca0ca..d121c4b467 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -388,7 +388,7 @@ void RideObject::SetRepositoryItem(ObjectRepositoryItem* item) const { // Find the first non-null ride type, to be used when checking the ride group and determining the category. auto firstRideType = _legacyType.GetFirstNonNullRideType(); - uint8_t category = GetRideTypeDescriptor(firstRideType).Category; + auto category = GetRideTypeDescriptor(firstRideType).Category; for (int32_t i = 0; i < RCT2::ObjectLimits::kMaxRideTypesPerRideEntry; i++) { @@ -396,7 +396,7 @@ void RideObject::SetRepositoryItem(ObjectRepositoryItem* item) const } for (int32_t i = 0; i < RCT2::ObjectLimits::kMaxCategoriesPerRide; i++) { - item->RideInfo.RideCategory[i] = category; + item->RideInfo.rideCategory[i] = category; } item->RideInfo.RideFlags = 0; @@ -977,19 +977,19 @@ ride_type_t RideObject::ParseRideType(const std::string& s) return std::distance(std::begin(kRideTypeDescriptors), result); } -static const EnumMap RideCategoryLookupTable{ - { "transport", RIDE_CATEGORY_TRANSPORT }, - { "gentle", RIDE_CATEGORY_GENTLE }, - { "rollercoaster", RIDE_CATEGORY_ROLLERCOASTER }, - { "thrill", RIDE_CATEGORY_THRILL }, - { "water", RIDE_CATEGORY_WATER }, - { "stall", RIDE_CATEGORY_SHOP }, +static const EnumMap RideCategoryLookupTable{ + { "transport", RideCategory::transport }, + { "gentle", RideCategory::gentle }, + { "rollercoaster", RideCategory::rollerCoaster }, + { "thrill", RideCategory::thrill }, + { "water", RideCategory::water }, + { "stall", RideCategory::shop }, }; -uint8_t RideObject::ParseRideCategory(const std::string& s) +RideCategory RideObject::ParseRideCategory(const std::string& s) { auto result = RideCategoryLookupTable.find(s); - return (result != RideCategoryLookupTable.end()) ? result->second : static_cast(RIDE_CATEGORY_TRANSPORT); + return (result != RideCategoryLookupTable.end()) ? result->second : RideCategory::transport; } static const EnumMap ShopItemLookupTable{ diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h index e76744d622..d922fb774e 100644 --- a/src/openrct2/object/RideObject.h +++ b/src/openrct2/object/RideObject.h @@ -17,6 +17,8 @@ #include +enum class RideCategory : uint8_t; + class RideObject final : public Object { private: @@ -65,7 +67,7 @@ private: static uint8_t CalculateNumHorizontalFrames(const CarEntry& carEntry); static bool IsRideTypeShopOrFacility(ride_type_t rideType); - static uint8_t ParseRideCategory(const std::string& s); + static RideCategory ParseRideCategory(const std::string& s); static ShopItem ParseShopItem(const std::string& s); static colour_t ParseColour(const std::string& s); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 2ad52d4de4..161cc4b0d6 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5505,7 +5505,7 @@ void FixInvalidVehicleSpriteSizes() } } -bool RideEntryHasCategory(const RideObjectEntry& rideEntry, uint8_t category) +bool RideEntryHasCategory(const RideObjectEntry& rideEntry, RideCategory category) { auto rideType = rideEntry.GetFirstNonNullRideType(); return GetRideTypeDescriptor(rideType).Category == category; diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 79df4dbd0c..66d94fb095 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -681,16 +681,16 @@ enum class RideMode : uint8_t RideMode& operator++(RideMode& d, int); -enum +enum class RideCategory : uint8_t { - RIDE_CATEGORY_TRANSPORT, - RIDE_CATEGORY_GENTLE, - RIDE_CATEGORY_ROLLERCOASTER, - RIDE_CATEGORY_THRILL, - RIDE_CATEGORY_WATER, - RIDE_CATEGORY_SHOP, + transport, + gentle, + rollerCoaster, + thrill, + water, + shop, - RIDE_CATEGORY_NONE = 255, + none = 255, }; enum @@ -990,7 +990,7 @@ bool RideHasRatings(const Ride& ride); int32_t GetUnifiedBoosterSpeed(ride_type_t rideType, int32_t relativeSpeed); void FixInvalidVehicleSpriteSizes(); -bool RideEntryHasCategory(const RideObjectEntry& rideEntry, uint8_t category); +bool RideEntryHasCategory(const RideObjectEntry& rideEntry, RideCategory category); ObjectEntryIndex RideGetEntryIndex(ride_type_t rideType, ObjectEntryIndex rideSubType); diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index ebe08fc9f1..1d651f8e16 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -375,19 +375,19 @@ ResearchCategory RideTypeDescriptor::GetResearchCategory() const { switch (Category) { - case RIDE_CATEGORY_TRANSPORT: + case RideCategory::transport: return ResearchCategory::Transport; - case RIDE_CATEGORY_GENTLE: + case RideCategory::gentle: return ResearchCategory::Gentle; - case RIDE_CATEGORY_ROLLERCOASTER: + case RideCategory::rollerCoaster: return ResearchCategory::Rollercoaster; - case RIDE_CATEGORY_THRILL: + case RideCategory::thrill: return ResearchCategory::Thrill; - case RIDE_CATEGORY_WATER: + case RideCategory::water: return ResearchCategory::Water; - case RIDE_CATEGORY_SHOP: + case RideCategory::shop: return ResearchCategory::Shop; - case RIDE_CATEGORY_NONE: + case RideCategory::none: break; } LOG_ERROR("Cannot get Research Category of invalid RideCategory"); diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index e6a6096e8f..18261f6e7a 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -464,7 +464,7 @@ constexpr uint64_t kRtdFlagsCommonCoasterNonAlt = EnumsToFlags( struct RideTypeDescriptor { - uint8_t Category{}; + RideCategory Category{}; /** rct2: 0x0097CC68 */ OpenRCT2::TrackElemType StartTrackPiece{}; TrackDrawerDescriptor TrackPaintFunctions{}; @@ -605,7 +605,7 @@ extern const StringId kRideModeNames[EnumValue(RideMode::count)]; // clang-format off constexpr RideTypeDescriptor kDummyRTD = { - .Category = RIDE_CATEGORY_NONE, + .Category = RideCategory::none, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = {}, .InvertedTrackPaintFunctions = {}, diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h index 90ea2effd9..d9fdfd9f3d 100644 --- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::airPoweredVerticalCoaster, diff --git a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h index c61292260d..908f5cdaa6 100644 --- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor AlpineCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::alpineCoaster, diff --git a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h index a86fffcb06..73f68f3a8d 100644 --- a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h +++ b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor BobsleighCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::bobsleighCoaster, diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h index a488e394e9..cd5b45a63c 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::juniorRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h index 74e9896054..9707d801c4 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::classicStandUpRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h index e577e6d0ed..74146d8c58 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::classicWoodenRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h index aca4c52609..cb3543e6f7 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::classicWoodenTwisterRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h index a67146a2bb..e30102c0fb 100644 --- a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor CompactInvertedCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::compactInvertedCoaster, diff --git a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h index e23921b4f0..260405e8d2 100644 --- a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::corkscrewRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h index 136d388b68..ce7cd8e4fa 100644 --- a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h @@ -18,7 +18,7 @@ // Non-inverted variant constexpr RideTypeDescriptor FlyingRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::flyingRollerCoaster, @@ -96,7 +96,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = { - .Category = RIDE_CATEGORY_NONE, + .Category = RideCategory::none, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::null, diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h index 696e24d2fd..c6e633a3e6 100644 --- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h +++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor GigaCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::latticeTriangle, diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h index 6f4eb99169..c3e846e95c 100644 --- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::heartlineTwisterCoaster, diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h index 27cc30792c..93ca86a9ef 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor HybridCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::hybridCoaster, diff --git a/src/openrct2/ride/rtd/coaster/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h index 8090e8d809..00bf183a6e 100644 --- a/src/openrct2/ride/rtd/coaster/HyperTwister.h +++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor HyperTwisterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::twisterRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h index b881035695..5a173a8617 100644 --- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h +++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor HypercoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::corkscrewRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h index f7e352dc2e..a44aadd70d 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::invertedHairpinCoaster, diff --git a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h index 71b1a47ad4..23097afdba 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::invertedImpulseCoaster, diff --git a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h index 955093309b..c4898c6467 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor InvertedRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::invertedRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h index a60923e510..733a16c509 100644 --- a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor JuniorRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::juniorRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h index daaea38625..1bf132f47c 100644 --- a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::limLaunchedRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h index af8e01d262..d54ec78ae8 100644 --- a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LSMLaunchedRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::latticeTriangleAlt, diff --git a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h index f3c7c77eab..6f35b57fc9 100644 --- a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LayDownRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor( { @@ -95,7 +95,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = { - .Category = RIDE_CATEGORY_NONE, + .Category = RideCategory::none, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::null, diff --git a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h index 69e7a96aea..0236b50d1c 100644 --- a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LoopingRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::loopingRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/MineRide.h b/src/openrct2/ride/rtd/coaster/MineRide.h index c125305c8e..afbeac4e73 100644 --- a/src/openrct2/ride/rtd/coaster/MineRide.h +++ b/src/openrct2/ride/rtd/coaster/MineRide.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MineRideRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::mineRide, diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h index a939e30fc2..0bbc3c475b 100644 --- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor MineTrainCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::mineTrainCoaster, diff --git a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h index 62541ea4a8..0a6c5558de 100644 --- a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MiniRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h index 9e111aee68..8ac3be09d3 100644 --- a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniSuspendedCoaster, diff --git a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h index f90f3dfb39..f4a499bf35 100644 --- a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::multiDimensionRollerCoaster, @@ -95,7 +95,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = { - .Category = RIDE_CATEGORY_NONE, + .Category = RideCategory::none, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::null, diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h index de30e7c052..ea02a69370 100644 --- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::reverseFreefallCoaster, diff --git a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h index 6e33d16a95..740abe57ba 100644 --- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor ReverserRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::reverserRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h index 7fff5f0b49..520b3c9357 100644 --- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::sideFrictionRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h index 490e5c1d55..8560da8090 100644 --- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::singleRailRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h index 942c73f69f..9665ae7422 100644 --- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SpinningWildMouseRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::steelWildMouse, diff --git a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h index 5024b38538..be7bc454b1 100644 --- a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SpiralRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h index f841297a9d..bd4b25e3fd 100644 --- a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor StandUpRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::standUpRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h index 3eae87ab8f..583d009678 100644 --- a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SteelWildMouseRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::steelWildMouse, diff --git a/src/openrct2/ride/rtd/coaster/Steeplechase.h b/src/openrct2/ride/rtd/coaster/Steeplechase.h index 50ffc11d86..8b7a1fed0a 100644 --- a/src/openrct2/ride/rtd/coaster/Steeplechase.h +++ b/src/openrct2/ride/rtd/coaster/Steeplechase.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SteeplechaseRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::steeplechase, diff --git a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h index 224bd06bcb..d947072046 100644 --- a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::suspendedSwingingCoaster, diff --git a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h index aa5181b912..6b9b81b2c0 100644 --- a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor TwisterRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::twisterRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h index 577d819aae..9d8e9cf18b 100644 --- a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h +++ b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor VerticalDropCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::twisterRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h index 046844d3c2..98b19d9a4d 100644 --- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h +++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor VirginiaReelRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::virginiaReel, diff --git a/src/openrct2/ride/rtd/coaster/WaterCoaster.h b/src/openrct2/ride/rtd/coaster/WaterCoaster.h index 860090894c..6a8be28ae2 100644 --- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h @@ -19,7 +19,7 @@ // clang-format off constexpr RideTypeDescriptor WaterCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor( { diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h index 90ebee1a4b..867bd76975 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor WoodenRollerCoasterRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::woodenRollerCoaster, diff --git a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h index a7873616c7..88bc46a803 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor WoodenWildMouseRTD = { - .Category = RIDE_CATEGORY_ROLLERCOASTER, + .Category = RideCategory::rollerCoaster, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::woodenWildMouse, diff --git a/src/openrct2/ride/rtd/gentle/CarRide.h b/src/openrct2/ride/rtd/gentle/CarRide.h index 033e0b26d7..418e2e02e7 100644 --- a/src/openrct2/ride/rtd/gentle/CarRide.h +++ b/src/openrct2/ride/rtd/gentle/CarRide.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor CarRideRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::carRide, diff --git a/src/openrct2/ride/rtd/gentle/Circus.h b/src/openrct2/ride/rtd/gentle/Circus.h index e1d4663c95..b47f17b50e 100644 --- a/src/openrct2/ride/rtd/gentle/Circus.h +++ b/src/openrct2/ride/rtd/gentle/Circus.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor CircusRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::circus, diff --git a/src/openrct2/ride/rtd/gentle/CrookedHouse.h b/src/openrct2/ride/rtd/gentle/CrookedHouse.h index a160cc0437..03c35d9a83 100644 --- a/src/openrct2/ride/rtd/gentle/CrookedHouse.h +++ b/src/openrct2/ride/rtd/gentle/CrookedHouse.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor CrookedHouseRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::crookedHouse, diff --git a/src/openrct2/ride/rtd/gentle/Dodgems.h b/src/openrct2/ride/rtd/gentle/Dodgems.h index c8b4273dfd..e01b3561cd 100644 --- a/src/openrct2/ride/rtd/gentle/Dodgems.h +++ b/src/openrct2/ride/rtd/gentle/Dodgems.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor DodgemsRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack4x4, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::dodgems, diff --git a/src/openrct2/ride/rtd/gentle/FerrisWheel.h b/src/openrct2/ride/rtd/gentle/FerrisWheel.h index 23bc697b79..28ce6862a2 100644 --- a/src/openrct2/ride/rtd/gentle/FerrisWheel.h +++ b/src/openrct2/ride/rtd/gentle/FerrisWheel.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor FerrisWheelRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x4C, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::ferrisWheel, diff --git a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h index 0bf68e1117..c5f222f4c3 100644 --- a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h +++ b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor FlyingSaucersRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack4x4, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::flyingSaucers, diff --git a/src/openrct2/ride/rtd/gentle/GhostTrain.h b/src/openrct2/ride/rtd/gentle/GhostTrain.h index 61b2a09986..1d5ad716fe 100644 --- a/src/openrct2/ride/rtd/gentle/GhostTrain.h +++ b/src/openrct2/ride/rtd/gentle/GhostTrain.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor GhostTrainRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::ghostTrain, diff --git a/src/openrct2/ride/rtd/gentle/HauntedHouse.h b/src/openrct2/ride/rtd/gentle/HauntedHouse.h index 4162b60d8c..cbc6659753 100644 --- a/src/openrct2/ride/rtd/gentle/HauntedHouse.h +++ b/src/openrct2/ride/rtd/gentle/HauntedHouse.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor HauntedHouseRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::hauntedHouse, diff --git a/src/openrct2/ride/rtd/gentle/Maze.h b/src/openrct2/ride/rtd/gentle/Maze.h index 3b1de76dc0..9a28128d11 100644 --- a/src/openrct2/ride/rtd/gentle/Maze.h +++ b/src/openrct2/ride/rtd/gentle/Maze.h @@ -19,7 +19,7 @@ // clang-format off constexpr RideTypeDescriptor MazeRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::Maze, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::maze, diff --git a/src/openrct2/ride/rtd/gentle/MerryGoRound.h b/src/openrct2/ride/rtd/gentle/MerryGoRound.h index 5a4b5a5724..523a1beb07 100644 --- a/src/openrct2/ride/rtd/gentle/MerryGoRound.h +++ b/src/openrct2/ride/rtd/gentle/MerryGoRound.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MerryGoRoundRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::merryGoRound, diff --git a/src/openrct2/ride/rtd/gentle/MiniGolf.h b/src/openrct2/ride/rtd/gentle/MiniGolf.h index d0648cd557..38a8f4bc0a 100644 --- a/src/openrct2/ride/rtd/gentle/MiniGolf.h +++ b/src/openrct2/ride/rtd/gentle/MiniGolf.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MiniGolfRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniGolf, diff --git a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h index d21eb5c28b..ce87695c2f 100644 --- a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h +++ b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor MiniHelicoptersRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniHelicopters, diff --git a/src/openrct2/ride/rtd/gentle/MonorailCycles.h b/src/openrct2/ride/rtd/gentle/MonorailCycles.h index 4ff0be2c1d..22a6226c44 100644 --- a/src/openrct2/ride/rtd/gentle/MonorailCycles.h +++ b/src/openrct2/ride/rtd/gentle/MonorailCycles.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor MonorailCyclesRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::monorailCycles, diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h index 8373c8a61f..80050cf936 100644 --- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h +++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor MonsterTrucksRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::carRide, diff --git a/src/openrct2/ride/rtd/gentle/ObservationTower.h b/src/openrct2/ride/rtd/gentle/ObservationTower.h index ff52191d17..3f58c0df37 100644 --- a/src/openrct2/ride/rtd/gentle/ObservationTower.h +++ b/src/openrct2/ride/rtd/gentle/ObservationTower.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor ObservationTowerRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::observationTower, diff --git a/src/openrct2/ride/rtd/gentle/SpaceRings.h b/src/openrct2/ride/rtd/gentle/SpaceRings.h index bb2e8437b9..3b3925c7c1 100644 --- a/src/openrct2/ride/rtd/gentle/SpaceRings.h +++ b/src/openrct2/ride/rtd/gentle/SpaceRings.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SpaceRingsRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::spaceRings, diff --git a/src/openrct2/ride/rtd/gentle/SpiralSlide.h b/src/openrct2/ride/rtd/gentle/SpiralSlide.h index dc32de2d71..e0a72f02fe 100644 --- a/src/openrct2/ride/rtd/gentle/SpiralSlide.h +++ b/src/openrct2/ride/rtd/gentle/SpiralSlide.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SpiralSlideRTD = { - .Category = RIDE_CATEGORY_GENTLE, + .Category = RideCategory::gentle, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack2x2, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::spiralSlide, diff --git a/src/openrct2/ride/rtd/shops/CashMachine.h b/src/openrct2/ride/rtd/shops/CashMachine.h index e2c0490e01..47fcab460a 100644 --- a/src/openrct2/ride/rtd/shops/CashMachine.h +++ b/src/openrct2/ride/rtd/shops/CashMachine.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor CashMachineRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::shop, diff --git a/src/openrct2/ride/rtd/shops/DrinkStall.h b/src/openrct2/ride/rtd/shops/DrinkStall.h index a5a9ddc087..9779bb4dd0 100644 --- a/src/openrct2/ride/rtd/shops/DrinkStall.h +++ b/src/openrct2/ride/rtd/shops/DrinkStall.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor DrinkStallRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::shop, diff --git a/src/openrct2/ride/rtd/shops/FirstAid.h b/src/openrct2/ride/rtd/shops/FirstAid.h index cded5c062f..0acd5eb585 100644 --- a/src/openrct2/ride/rtd/shops/FirstAid.h +++ b/src/openrct2/ride/rtd/shops/FirstAid.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor FirstAidRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::facility, diff --git a/src/openrct2/ride/rtd/shops/FoodStall.h b/src/openrct2/ride/rtd/shops/FoodStall.h index c1077adb95..161d7fcea8 100644 --- a/src/openrct2/ride/rtd/shops/FoodStall.h +++ b/src/openrct2/ride/rtd/shops/FoodStall.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor FoodStallRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::shop, diff --git a/src/openrct2/ride/rtd/shops/InformationKiosk.h b/src/openrct2/ride/rtd/shops/InformationKiosk.h index 6394b13820..e2225bf8d8 100644 --- a/src/openrct2/ride/rtd/shops/InformationKiosk.h +++ b/src/openrct2/ride/rtd/shops/InformationKiosk.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor InformationKioskRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1B, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::shop, diff --git a/src/openrct2/ride/rtd/shops/Shop.h b/src/openrct2/ride/rtd/shops/Shop.h index e5c0cbb344..83226124bf 100644 --- a/src/openrct2/ride/rtd/shops/Shop.h +++ b/src/openrct2/ride/rtd/shops/Shop.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor ShopRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::shop, diff --git a/src/openrct2/ride/rtd/shops/Toilets.h b/src/openrct2/ride/rtd/shops/Toilets.h index bfaa2a072e..78d69f9f64 100644 --- a/src/openrct2/ride/rtd/shops/Toilets.h +++ b/src/openrct2/ride/rtd/shops/Toilets.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor ToiletsRTD = { - .Category = RIDE_CATEGORY_SHOP, + .Category = RideCategory::shop, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::facility, diff --git a/src/openrct2/ride/rtd/thrill/3DCinema.h b/src/openrct2/ride/rtd/thrill/3DCinema.h index 8aa9082efe..695240ccd6 100644 --- a/src/openrct2/ride/rtd/thrill/3DCinema.h +++ b/src/openrct2/ride/rtd/thrill/3DCinema.h @@ -17,7 +17,7 @@ // C++ does not allow names to start with a number, hence the absence of the '3D' prefix. constexpr RideTypeDescriptor CinemaRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::_3DCinema, diff --git a/src/openrct2/ride/rtd/thrill/Enterprise.h b/src/openrct2/ride/rtd/thrill/Enterprise.h index bf7f0009a5..1aa32d417e 100644 --- a/src/openrct2/ride/rtd/thrill/Enterprise.h +++ b/src/openrct2/ride/rtd/thrill/Enterprise.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor EnterpriseRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack4x4, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::enterprise, diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h index bbccd76e00..3ac9605ac5 100644 --- a/src/openrct2/ride/rtd/thrill/GoKarts.h +++ b/src/openrct2/ride/rtd/thrill/GoKarts.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor GoKartsRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::goKarts, diff --git a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h index 05b4464ac1..af34ce2517 100644 --- a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h +++ b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LaunchedFreefallRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::launchedFreefall, diff --git a/src/openrct2/ride/rtd/thrill/MagicCarpet.h b/src/openrct2/ride/rtd/thrill/MagicCarpet.h index a14f380cc6..8ded844848 100644 --- a/src/openrct2/ride/rtd/thrill/MagicCarpet.h +++ b/src/openrct2/ride/rtd/thrill/MagicCarpet.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor MagicCarpetRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x4A, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::magicCarpet, diff --git a/src/openrct2/ride/rtd/thrill/MotionSimulator.h b/src/openrct2/ride/rtd/thrill/MotionSimulator.h index 6f856d1d16..87e588547d 100644 --- a/src/openrct2/ride/rtd/thrill/MotionSimulator.h +++ b/src/openrct2/ride/rtd/thrill/MotionSimulator.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor MotionSimulatorRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack2x2, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::motionSimulator, diff --git a/src/openrct2/ride/rtd/thrill/RotoDrop.h b/src/openrct2/ride/rtd/thrill/RotoDrop.h index 3120b187aa..b73748bbe0 100644 --- a/src/openrct2/ride/rtd/thrill/RotoDrop.h +++ b/src/openrct2/ride/rtd/thrill/RotoDrop.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor RotoDropRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::rotoDrop, diff --git a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h index b067eb3dbc..e20d0bc65f 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SwingingInverterShipRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x4B, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::swingingInverterShip, diff --git a/src/openrct2/ride/rtd/thrill/SwingingShip.h b/src/openrct2/ride/rtd/thrill/SwingingShip.h index 5185dfdffa..5827fbde4f 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingShip.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SwingingShipRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x5, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::swingingShip, diff --git a/src/openrct2/ride/rtd/thrill/TopSpin.h b/src/openrct2/ride/rtd/thrill/TopSpin.h index d2cd7789fc..5fccfa303d 100644 --- a/src/openrct2/ride/rtd/thrill/TopSpin.h +++ b/src/openrct2/ride/rtd/thrill/TopSpin.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor TopSpinRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::topSpin, diff --git a/src/openrct2/ride/rtd/thrill/Twist.h b/src/openrct2/ride/rtd/thrill/Twist.h index 1a6432e500..ad1411636a 100644 --- a/src/openrct2/ride/rtd/thrill/Twist.h +++ b/src/openrct2/ride/rtd/thrill/Twist.h @@ -16,7 +16,7 @@ // clang-format off constexpr RideTypeDescriptor TwistRTD = { - .Category = RIDE_CATEGORY_THRILL, + .Category = RideCategory::thrill, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::twist, diff --git a/src/openrct2/ride/rtd/transport/Chairlift.h b/src/openrct2/ride/rtd/transport/Chairlift.h index e33d73bdea..932a01e3f1 100644 --- a/src/openrct2/ride/rtd/transport/Chairlift.h +++ b/src/openrct2/ride/rtd/transport/Chairlift.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor ChairliftRTD = { - .Category = RIDE_CATEGORY_TRANSPORT, + .Category = RideCategory::transport, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::chairlift, diff --git a/src/openrct2/ride/rtd/transport/Lift.h b/src/openrct2/ride/rtd/transport/Lift.h index e4b88b58d6..a2a2cb32fc 100644 --- a/src/openrct2/ride/rtd/transport/Lift.h +++ b/src/openrct2/ride/rtd/transport/Lift.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LiftRTD = { - .Category = RIDE_CATEGORY_TRANSPORT, + .Category = RideCategory::transport, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::lift, diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h index 18fccd456d..f933dd57a8 100644 --- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h +++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor MiniatureRailwayRTD = { - .Category = RIDE_CATEGORY_TRANSPORT, + .Category = RideCategory::transport, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniatureRailway, diff --git a/src/openrct2/ride/rtd/transport/Monorail.h b/src/openrct2/ride/rtd/transport/Monorail.h index e16bd93357..77bcdf5cb4 100644 --- a/src/openrct2/ride/rtd/transport/Monorail.h +++ b/src/openrct2/ride/rtd/transport/Monorail.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor MonorailRTD = { - .Category = RIDE_CATEGORY_TRANSPORT, + .Category = RideCategory::transport, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::monorail, diff --git a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h index 1c8e21e777..a250896f00 100644 --- a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h +++ b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor SuspendedMonorailRTD = { - .Category = RIDE_CATEGORY_TRANSPORT, + .Category = RideCategory::transport, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::suspendedMonorail, diff --git a/src/openrct2/ride/rtd/water/BoatHire.h b/src/openrct2/ride/rtd/water/BoatHire.h index 2780432611..f6e9ea8a71 100644 --- a/src/openrct2/ride/rtd/water/BoatHire.h +++ b/src/openrct2/ride/rtd/water/BoatHire.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor BoatHireRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::boatHire, diff --git a/src/openrct2/ride/rtd/water/DinghySlide.h b/src/openrct2/ride/rtd/water/DinghySlide.h index 71bfaec8e5..33733646b7 100644 --- a/src/openrct2/ride/rtd/water/DinghySlide.h +++ b/src/openrct2/ride/rtd/water/DinghySlide.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor DinghySlideRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor( { diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h index c53da6b556..54d85718ca 100644 --- a/src/openrct2/ride/rtd/water/LogFlume.h +++ b/src/openrct2/ride/rtd/water/LogFlume.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor LogFlumeRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::logFlume, diff --git a/src/openrct2/ride/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h index d5313a89c1..63c51eca53 100644 --- a/src/openrct2/ride/rtd/water/RiverRafts.h +++ b/src/openrct2/ride/rtd/water/RiverRafts.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor RiverRaftsRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::splashBoats, diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h index d762cb8432..fc5e8cce78 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -17,7 +17,7 @@ // clang-format off constexpr RideTypeDescriptor RiverRapidsRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::riverRapids, diff --git a/src/openrct2/ride/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h index d2af8bc297..d769885651 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor SplashBoatsRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::splashBoats, diff --git a/src/openrct2/ride/rtd/water/SubmarineRide.h b/src/openrct2/ride/rtd/water/SubmarineRide.h index 96577b4d58..6d62f4edaf 100644 --- a/src/openrct2/ride/rtd/water/SubmarineRide.h +++ b/src/openrct2/ride/rtd/water/SubmarineRide.h @@ -18,7 +18,7 @@ // clang-format off constexpr RideTypeDescriptor SubmarineRideRTD = { - .Category = RIDE_CATEGORY_WATER, + .Category = RideCategory::water, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::submarineRide, diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 9c33f2f214..39211f3927 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -539,7 +539,7 @@ static ResultWithMessage ScenarioPrepareRidesForSave(GameState_t& gameState) if (rideEntry != nullptr) { // If there are more than 5 roller coasters, only mark the first five. - if (isFiveCoasterObjective && (RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && rcs < 5)) + if (isFiveCoasterObjective && (RideEntryHasCategory(*rideEntry, RideCategory::rollerCoaster) && rcs < 5)) { ride.lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK; rcs++; @@ -664,7 +664,7 @@ ObjectiveStatus Objective::Check10RollerCoasters() const auto rideEntry = ride.GetRideEntry(); if (rideEntry != nullptr) { - if (RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) + if (RideEntryHasCategory(*rideEntry, RideCategory::rollerCoaster) && !type_already_counted[ride.subtype]) { type_already_counted[ride.subtype] = true; rcs++; @@ -766,7 +766,7 @@ ObjectiveStatus Objective::Check10RollerCoastersLength() const auto rideEntry = ride.GetRideEntry(); if (rideEntry != nullptr) { - if (RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) + if (RideEntryHasCategory(*rideEntry, RideCategory::rollerCoaster) && !type_already_counted[ride.subtype]) { if (ToHumanReadableRideLength(ride.GetTotalLength()) >= MinimumLength) { @@ -798,7 +798,7 @@ ObjectiveStatus Objective::CheckFinish5RollerCoasters() const if (rideEntry != nullptr) { if ((ride.lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) - && RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER)) + && RideEntryHasCategory(*rideEntry, RideCategory::rollerCoaster)) { rcs++; }