diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 8aa0eaeaaf..6bc8053994 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -30,94 +30,94 @@ namespace OpenRCT2::RCT1 enum class RideType : uint8_t { - WoodenRollerCoaster = 0, - StandUpSteelRollerCoaster, - SuspendedRollerCoaster, - InvertedRollerCoaster, - SteelMiniRollerCoaster, - MiniatureRailway, - Monorail, - SuspendedSingleRailRollerCoaster, - BoatHire, - WoodenCrazyRodentRollerCoaster, - SingleRailRollerCoaster, - CarRide, - LaunchedFreefall, - BobsledRollerCoaster, - ObservationTower, - SteelRollerCoaster, - WaterSlide, - MineTrainRollerCoaster, - Chairlift, - SteelCorkscrewRollerCoaster, - HedgeMaze, - SpiralSlide, - GoKarts, - LogFlume, - RiverRapids, - Dodgems, - SwingingShip, - SwingingInverterShip, - IceCreamStall, - ChipsStall, - DrinkStall, - CandyflossStall, - BurgerBar, - MerryGoRound, - BalloonStall, - InformationKiosk, - Toilets, - FerrisWheel, - MotionSimulator, + woodenRollerCoaster = 0, + standUpSteelRollerCoaster, + suspendedRollerCoaster, + invertedRollerCoaster, + steelMiniRollerCoaster, + miniatureRailway, + monorail, + suspendedSingleRailRollerCoaster, + boatHire, + woodenCrazyRodentRollerCoaster, + singleRailRollerCoaster, + carRide, + launchedFreefall, + bobsledRollerCoaster, + observationTower, + steelRollerCoaster, + waterSlide, + mineTrainRollerCoaster, + chairlift, + steelCorkscrewRollerCoaster, + hedgeMaze, + spiralSlide, + goKarts, + logFlume, + riverRapids, + dodgems, + swingingShip, + swingingInverterShip, + iceCreamStall, + chipsStall, + drinkStall, + candyflossStall, + burgerBar, + merryGoRound, + balloonStall, + informationKiosk, + toilets, + ferrisWheel, + motionSimulator, _3DCinema, - TopSpin, - SpaceRings, - ReverseFreefallRollerCoaster, - SouvenirStall, - VerticalRollerCoaster, - PizzaStall, - Twist, - HauntedHouse, - PopcornStall, - Circus, - GhostTrain, - SteelTwisterRollerCoaster, - WoodenTwisterRollerCoaster, - WoodenSideFrictionRollerCoaster, - SteelWildMouseRollerCoaster, - HotDogStall, - ExoticSeaFoodStall, - HatStall, - ToffeeAppleStall, - VirginiaReel, - RiverRide, - CycleMonorail, - FlyingRollerCoaster, - SuspendedMonorail, + topSpin, + spaceRings, + reverseFreefallRollerCoaster, + souvenirStall, + verticalRollerCoaster, + pizzaStall, + twist, + hauntedHouse, + popcornStall, + circus, + ghostTrain, + steelTwisterRollerCoaster, + woodenTwisterRollerCoaster, + woodenSideFrictionRollerCoaster, + steelWildMouseRollerCoaster, + hotDogStall, + exoticSeaFoodStall, + hatStall, + toffeeAppleStall, + virginiaReel, + riverRide, + cycleMonorail, + flyingRollerCoaster, + suspendedMonorail, _40, - WoodenReverseRollerCoaster, - HeartlineTwisterRollerCoaster, - MiniatureGolf, + woodenReverseRollerCoaster, + heartlineTwisterRollerCoaster, + miniatureGolf, _44, - RotoDrop, - FlyingSaucers, - CrookedHouse, - CycleRailway, - SuspendedLoopingRollerCoaster, - WaterCoaster, - AirPoweredVerticalCoaster, - InvertedWildMouseCoaster, - JetSkis, - TShirtStall, - RaftRide, - DoughnutShop, - Enterprise, - CoffeeShop, - FriedChickenStall, - LemonadeStall, + rotoDrop, + flyingSaucers, + crookedHouse, + cycleRailway, + suspendedLoopingRollerCoaster, + waterCoaster, + airPoweredVerticalCoaster, + invertedWildMouseCoaster, + jetSkis, + tShirtStall, + raftRide, + doughnutShop, + enterprise, + coffeeShop, + friedChickenStall, + lemonadeStall, - Count, - Null = 255, + count, + null = 255, }; enum class VehicleType : uint8_t diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index a7926ee626..e9b660373e 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -120,7 +120,7 @@ namespace OpenRCT2::RCT1 RCT12::EntryList _footpathRailingsEntries; // Lookup tables for converting from RCT1 hard coded types to the new dynamic object entries - ObjectEntryIndex _rideTypeToRideEntryMap[EnumValue(RideType::Count)]{}; + ObjectEntryIndex _rideTypeToRideEntryMap[EnumValue(RideType::count)]{}; ObjectEntryIndex _vehicleTypeToRideEntryMap[EnumValue(VehicleType::Count)]{}; ObjectEntryIndex _smallSceneryTypeToEntryMap[256]{}; ObjectEntryIndex _largeSceneryTypeToEntryMap[256]{}; @@ -136,7 +136,7 @@ namespace OpenRCT2::RCT1 // Research BitSet _researchRideEntryUsed{}; - BitSet _researchRideTypeUsed{}; + BitSet _researchRideTypeUsed{}; // Scenario repository - used for determining scenario name IScenarioRepository* _scenarioRepository = GetScenarioRepository(); @@ -450,7 +450,7 @@ namespace OpenRCT2::RCT1 { size_t researchListCount; const ResearchItem* researchList = GetResearchList(&researchListCount); - BitSet rideTypeInResearch = GetRideTypesPresentInResearchList( + BitSet rideTypeInResearch = GetRideTypesPresentInResearchList( researchList, researchListCount); for (size_t i = 0; i < researchListCount; i++) { @@ -558,7 +558,7 @@ namespace OpenRCT2::RCT1 for (size_t i = 0; i < std::size(_s4.Rides); i++) { auto ride = &_s4.Rides[i]; - if (ride->type != RideType::Null) + if (ride->type != RideType::null) { if (RCT1::RideTypeUsesVehicles(ride->type)) AddEntryForVehicleType(ride->type, ride->vehicleType); @@ -668,7 +668,7 @@ namespace OpenRCT2::RCT1 auto entryIndex = _rideEntries.GetOrAddEntry(entryName); _vehicleTypeToRideEntryMap[EnumValue(vehicleType)] = entryIndex; - if (rideType != RideType::Null) + if (rideType != RideType::null) AddEntryForRideType(rideType); } } @@ -826,7 +826,7 @@ namespace OpenRCT2::RCT1 { for (int32_t i = 0; i < Limits::kMaxRidesInPark; i++) { - if (_s4.Rides[i].type != RideType::Null) + if (_s4.Rides[i].type != RideType::null) { const auto rideId = RideId::FromUnderlying(i); ImportRide(RideAllocateAtIndex(rideId), &_s4.Rides[i], rideId); @@ -840,7 +840,7 @@ namespace OpenRCT2::RCT1 dst->id = rideIndex; // This is a peculiarity of this exact version number, which only Heide-Park seems to use. - if (_s4.GameVersion == 110018 && src->type == RideType::InvertedRollerCoaster) + if (_s4.GameVersion == 110018 && src->type == RideType::invertedRollerCoaster) { dst->type = RIDE_TYPE_COMPACT_INVERTED_COASTER; } @@ -995,7 +995,7 @@ namespace OpenRCT2::RCT1 // Only merry-go-round and dodgems had music and used // the same flag as synchronise stations for the option to enable it - if (src->type == RideType::MerryGoRound || src->type == RideType::Dodgems) + if (src->type == RideType::merryGoRound || src->type == RideType::dodgems) { if (src->departFlags & RCT1_RIDE_DEPART_PLAY_MUSIC) { @@ -1058,7 +1058,7 @@ namespace OpenRCT2::RCT1 dst->startDropHeight = src->startDropHeight / 2; dst->highestDropHeight = src->highestDropHeight / 2; - if (src->type == RideType::MiniatureGolf) + if (src->type == RideType::miniatureGolf) dst->numHoles = src->numInversions & kRCT12InversionAndHoleMask; else dst->numInversions = src->numInversions & kRCT12InversionAndHoleMask; @@ -1128,11 +1128,11 @@ namespace OpenRCT2::RCT1 dst->trackColours[0].supports = RCT1::GetColour(src->trackSupportColour); // Balloons were always blue in the original RCT. - if (src->type == RideType::BalloonStall) + if (src->type == RideType::balloonStall) { dst->trackColours[0].main = COLOUR_LIGHT_BLUE; } - else if (src->type == RideType::RiverRapids) + else if (src->type == RideType::riverRapids) { dst->trackColours[0].main = COLOUR_WHITE; } @@ -1161,7 +1161,7 @@ namespace OpenRCT2::RCT1 } } - if (_gameVersion < FILE_VERSION_RCT1_LL && src->type == RideType::MerryGoRound) + if (_gameVersion < FILE_VERSION_RCT1_LL && src->type == RideType::merryGoRound) { // The merry-go-round in pre-LL versions was always yellow with red dst->vehicleColours[0].Body = COLOUR_YELLOW; @@ -1216,7 +1216,7 @@ namespace OpenRCT2::RCT1 // In RCT1 and AA, the maze was always hedges. // LL has 4 types, like RCT2. For LL, only guard against invalid values. - if (src->type == RideType::HedgeMaze) + if (src->type == RideType::hedgeMaze) { if (_gameVersion < FILE_VERSION_RCT1_LL || src->trackColourSupports[0] > 3) dst->trackColours[0].supports = MazeWallType::hedges; @@ -1761,7 +1761,7 @@ namespace OpenRCT2::RCT1 dst2->SetStationIndex(StationIndex::FromUnderlying(src2->GetStationIndex())); dst2->SetHasGreenLight(src2->HasGreenLight()); dst2->SetIsIndestructible(src2->IsIndestructible()); - if (rct1RideType == RideType::GhostTrain) + if (rct1RideType == RideType::ghostTrain) { dst2->SetDoorAState(src2->GetDoorAState()); dst2->SetDoorBState(src2->GetDoorBState()); @@ -1785,7 +1785,7 @@ namespace OpenRCT2::RCT1 } // This has to be done last, since the maze entry shares fields with the colour and sequence fields. - if (rct1RideType == RideType::HedgeMaze) + if (rct1RideType == RideType::hedgeMaze) { dst2->SetMazeEntry(src2->GetMazeEntry()); } @@ -2158,10 +2158,10 @@ namespace OpenRCT2::RCT1 } } - static BitSet GetRideTypesPresentInResearchList( + static BitSet GetRideTypesPresentInResearchList( const RCT1::ResearchItem* researchList, size_t researchListCount) { - BitSet ret = {}; + BitSet ret = {}; for (size_t i = 0; i < researchListCount; i++) { diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index 522163bbf4..12f6f0e90e 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -103,7 +103,7 @@ namespace OpenRCT2::RCT1 } // The maze style is saved in the support colour, but taking it through the conversion function // will mess up style 3 (wooden fences). - if (td4aa.Type == RideType::HedgeMaze) + if (td4aa.Type == RideType::hedgeMaze) { td->appearance.trackColours[0].supports = td4aa.TrackSupportColour[0]; } @@ -123,11 +123,11 @@ namespace OpenRCT2::RCT1 td->appearance.trackColours[i].supports = RCT1::GetColour(td4.TrackSupportColourV0); // Mazes were only hedges - if (td4.Type == RideType::HedgeMaze) + if (td4.Type == RideType::hedgeMaze) { td->appearance.trackColours[i].supports = MazeWallType::hedges; } - else if (td4.Type == RideType::RiverRapids) + else if (td4.Type == RideType::riverRapids) { td->appearance.trackColours[i].main = COLOUR_WHITE; td->appearance.trackColours[i].additional = COLOUR_WHITE; @@ -149,7 +149,7 @@ namespace OpenRCT2::RCT1 } std::string_view vehicleObject; - if (td4Base.Type == RideType::HedgeMaze) + if (td4Base.Type == RideType::hedgeMaze) { vehicleObject = RCT1::GetRideTypeObject(td4Base.Type, false); } @@ -227,7 +227,7 @@ namespace OpenRCT2::RCT1 td->statistics.maxNegativeVerticalG = td4Base.MaxNegativeVerticalG * kTD46GForcesMultiplier; td->statistics.maxLateralG = td4Base.MaxLateralG * kTD46GForcesMultiplier; - if (td4Base.Type == RideType::MiniatureGolf) + if (td4Base.Type == RideType::miniatureGolf) td->statistics.holes = td4Base.NumHoles & kRCT12InversionAndHoleMask; else td->statistics.inversions = td4Base.NumInversions & kRCT12InversionAndHoleMask; diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index fa17fb136d..e329e32ce9 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -164,9 +164,9 @@ namespace OpenRCT2::RCT1 uint8_t GetRideType(RideType rideType, VehicleType vehicleType) { - if (rideType == RideType::SteelTwisterRollerCoaster && vehicleType == VehicleType::NonLoopingSteelTwisterRollerCoasterTrain) + if (rideType == RideType::steelTwisterRollerCoaster && vehicleType == VehicleType::NonLoopingSteelTwisterRollerCoasterTrain) return RIDE_TYPE_HYPER_TWISTER; - if (rideType == RideType::SteelCorkscrewRollerCoaster && vehicleType == VehicleType::HypercoasterTrain) + if (rideType == RideType::steelCorkscrewRollerCoaster && vehicleType == VehicleType::HypercoasterTrain) return RIDE_TYPE_HYPERCOASTER; static uint8_t map[] = @@ -366,30 +366,30 @@ namespace OpenRCT2::RCT1 bool RideTypeUsesVehicles(RideType rideType) { switch (rideType) { - case RideType::HedgeMaze: - case RideType::SpiralSlide: - case RideType::IceCreamStall: - case RideType::ChipsStall: - case RideType::DrinkStall: - case RideType::CandyflossStall: - case RideType::BurgerBar: - case RideType::BalloonStall: - case RideType::InformationKiosk: - case RideType::Toilets: - case RideType::SouvenirStall: - case RideType::PizzaStall: - case RideType::PopcornStall: - case RideType::HotDogStall: - case RideType::ExoticSeaFoodStall: - case RideType::HatStall: - case RideType::ToffeeAppleStall: + case RideType::hedgeMaze: + case RideType::spiralSlide: + case RideType::iceCreamStall: + case RideType::chipsStall: + case RideType::drinkStall: + case RideType::candyflossStall: + case RideType::burgerBar: + case RideType::balloonStall: + case RideType::informationKiosk: + case RideType::toilets: + case RideType::souvenirStall: + case RideType::pizzaStall: + case RideType::popcornStall: + case RideType::hotDogStall: + case RideType::exoticSeaFoodStall: + case RideType::hatStall: + case RideType::toffeeAppleStall: case RideType::_40: case RideType::_44: - case RideType::TShirtStall: - case RideType::DoughnutShop: - case RideType::CoffeeShop: - case RideType::FriedChickenStall: - case RideType::LemonadeStall: + case RideType::tShirtStall: + case RideType::doughnutShop: + case RideType::coffeeShop: + case RideType::friedChickenStall: + case RideType::lemonadeStall: return false; default: return true; @@ -697,7 +697,7 @@ namespace OpenRCT2::RCT1 std::string_view GetRideTypeObject(RideType rideType, bool isLL) { - if (rideType == RideType::InvertedRollerCoaster && !isLL) { + if (rideType == RideType::invertedRollerCoaster && !isLL) { return "rct1.ride.inverted_trains"; }