diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 60385622f8..e34bc1fa99 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -3069,7 +3069,7 @@ namespace OpenRCT2::Ui::Windows maxValue = OpenRCT2::Limits::kCheatsMaxOperatingLimit; } - uint8_t increment = ride->mode == RideMode::Dodgems ? 10 : 1; + uint8_t increment = ride->mode == RideMode::dodgems ? 10 : 1; SetOperatingSetting( rideId, RideSetSetting::Operation, std::clamp(ride->operation_option + increment, minValue, maxValue)); @@ -3090,7 +3090,7 @@ namespace OpenRCT2::Ui::Windows maxValue = OpenRCT2::Limits::kCheatsMaxOperatingLimit; } - uint8_t decrement = ride->mode == RideMode::Dodgems ? 10 : 1; + uint8_t decrement = ride->mode == RideMode::dodgems ? 10 : 1; SetOperatingSetting( rideId, RideSetSetting::Operation, std::clamp(ride->operation_option - decrement, minValue, maxValue)); @@ -3110,7 +3110,7 @@ namespace OpenRCT2::Ui::Windows // Create dropdown list auto numAvailableModes = 0; auto checkedIndex = -1; - for (auto i = 0; i < static_cast(RideMode::Count); i++) + for (auto i = 0; i < static_cast(RideMode::count); i++) { if (availableModes & (1uLL << i)) { @@ -3325,12 +3325,12 @@ namespace OpenRCT2::Ui::Windows { switch (ride.mode) { - case RideMode::PoweredLaunchPasstrough: - case RideMode::PoweredLaunch: - case RideMode::UpwardLaunch: - case RideMode::PoweredLaunchBlockSectioned: - case RideMode::StationToStation: - case RideMode::Dodgems: + case RideMode::poweredLaunchPasstrough: + case RideMode::poweredLaunch: + case RideMode::upwardLaunch: + case RideMode::poweredLaunchBlockSectioned: + case RideMode::stationToStation: + case RideMode::dodgems: return; default: break; @@ -3367,10 +3367,10 @@ namespace OpenRCT2::Ui::Windows { case WIDX_MODE_DROPDOWN: { - RideMode rideMode = RideMode::NullMode; + RideMode rideMode = RideMode::nullMode; auto availableModes = ride->GetAvailableModes(); auto modeInDropdownIndex = -1; - for (RideMode rideModeIndex = RideMode::Normal; rideModeIndex < RideMode::Count; rideModeIndex++) + for (RideMode rideModeIndex = RideMode::normal; rideModeIndex < RideMode::count; rideModeIndex++) { if (availableModes & EnumToFlag(rideModeIndex)) { @@ -3382,7 +3382,7 @@ namespace OpenRCT2::Ui::Windows } } } - if (rideMode != RideMode::NullMode) + if (rideMode != RideMode::nullMode) SetOperatingSetting(rideId, RideSetSetting::Mode, static_cast(rideMode)); break; } @@ -3609,10 +3609,10 @@ namespace OpenRCT2::Ui::Windows ft.Add(static_cast(ride->operation_option) * multiplier); switch (ride->mode) { - case RideMode::PoweredLaunchPasstrough: - case RideMode::PoweredLaunch: - case RideMode::UpwardLaunch: - case RideMode::PoweredLaunchBlockSectioned: + case RideMode::poweredLaunchPasstrough: + case RideMode::poweredLaunch: + case RideMode::upwardLaunch: + case RideMode::poweredLaunchBlockSectioned: ft.Rewind(); ft.Increment(18); ft.Add((ride->launch_speed * 9) / 4); @@ -3620,7 +3620,7 @@ namespace OpenRCT2::Ui::Windows caption = STR_LAUNCH_SPEED; tooltip = STR_LAUNCH_SPEED_TIP; break; - case RideMode::StationToStation: + case RideMode::stationToStation: ft.Rewind(); ft.Increment(18); ft.Add((ride->speed * 9) / 4); @@ -3628,7 +3628,7 @@ namespace OpenRCT2::Ui::Windows caption = STR_SPEED; tooltip = STR_SPEED_TIP; break; - case RideMode::Race: + case RideMode::race: ft.Rewind(); ft.Increment(18); ft.Add(ride->NumLaps); @@ -3636,19 +3636,19 @@ namespace OpenRCT2::Ui::Windows caption = STR_NUMBER_OF_LAPS; tooltip = STR_NUMBER_OF_LAPS_TIP; break; - case RideMode::Dodgems: + case RideMode::dodgems: format = STR_RIDE_MODE_TIME_LIMIT_VALUE; caption = STR_TIME_LIMIT; tooltip = STR_TIME_LIMIT_TIP; break; - case RideMode::Swing: + case RideMode::swing: format = STR_RIDE_MODE_NUMBER_OF_SWINGS_VALUE; caption = STR_NUMBER_OF_SWINGS; tooltip = STR_NUMBER_OF_SWINGS_TIP; break; - case RideMode::Rotation: - case RideMode::ForwardRotation: - case RideMode::BackwardRotation: + case RideMode::rotation: + case RideMode::forwardRotation: + case RideMode::backwardRotation: format = STR_NUMBER_OF_ROTATIONS_VALUE; caption = STR_NUMBER_OF_ROTATIONS; tooltip = STR_NUMBER_OF_ROTATIONS_TIP; @@ -3707,7 +3707,7 @@ namespace OpenRCT2::Ui::Windows { auto ft = Formatter(); ft.Add(ride->num_block_brakes + ride->num_stations); - auto underWidget = ride->mode == RideMode::PoweredLaunchBlockSectioned ? WIDX_MODE_TWEAK : WIDX_MODE; + auto underWidget = ride->mode == RideMode::poweredLaunchBlockSectioned ? WIDX_MODE_TWEAK : WIDX_MODE; DrawTextBasic( dpi, windowPos + ScreenCoordsXY{ 21, widgets[underWidget].bottom + 3 }, STR_BLOCK_SECTIONS, ft, { COLOUR_BLACK }); diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 3724b15539..7fb5d2bd86 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -305,7 +305,7 @@ namespace OpenRCT2::Ui::Windows if (RideTryGetOriginElement(*currentRide, nullptr)) { // Auto open shops if required. - if (currentRide->mode == RideMode::ShopStall && Config::Get().general.AutoOpenShops) + if (currentRide->mode == RideMode::shopStall && Config::Get().general.AutoOpenShops) { // HACK: Until we find a good a way to defer the game command for opening the shop, stop this // from getting stuck in an infinite loop as opening the currentRide will try to close this window diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index 6204c6b982..a67eee0f43 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -294,17 +294,17 @@ StringId RideSetSettingAction::GetOperationErrorMessage(const Ride& ride) const { switch (ride.mode) { - case RideMode::StationToStation: + case RideMode::stationToStation: return STR_CANT_CHANGE_SPEED; - case RideMode::Race: + case RideMode::race: return STR_CANT_CHANGE_NUMBER_OF_LAPS; - case RideMode::Dodgems: + case RideMode::dodgems: return STR_CANT_CHANGE_TIME_LIMIT; - case RideMode::Swing: + case RideMode::swing: return STR_CANT_CHANGE_NUMBER_OF_SWINGS; - case RideMode::Rotation: - case RideMode::ForwardRotation: - case RideMode::BackwardRotation: + case RideMode::rotation: + case RideMode::forwardRotation: + case RideMode::backwardRotation: return STR_CANT_CHANGE_NUMBER_OF_ROTATIONS; default: if (ride.GetRideTypeDescriptor().HasFlag(RtdFlag::noVehicles)) diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 264b8509fb..db183dfc1d 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -708,14 +708,14 @@ GameActions::Result TrackPlaceAction::Execute() const ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_OPERATING; // change the current mode to its circuit blocked equivalent - RideMode newMode = RideMode::ContinuousCircuitBlockSectioned; - if (ride->mode == RideMode::PoweredLaunch) + RideMode newMode = RideMode::continuousCircuitBlockSectioned; + if (ride->mode == RideMode::poweredLaunch) { - if (rtd.SupportsRideMode(RideMode::PoweredLaunchBlockSectioned) + if (rtd.SupportsRideMode(RideMode::poweredLaunchBlockSectioned) || GetGameState().Cheats.showAllOperatingModes) - newMode = RideMode::PoweredLaunchBlockSectioned; + newMode = RideMode::poweredLaunchBlockSectioned; else - newMode = RideMode::PoweredLaunch; + newMode = RideMode::poweredLaunch; } auto rideSetSetting = RideSetSettingAction(ride->id, RideSetSetting::Mode, static_cast(newMode)); diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index 5191487256..03dffa0749 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -468,10 +468,10 @@ GameActions::Result TrackRemoveAction::Execute() const if (ride->num_block_brakes == 0) { ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_OPERATING; - RideMode newMode = RideMode::ContinuousCircuit; - if (ride->mode == RideMode::PoweredLaunchBlockSectioned) + RideMode newMode = RideMode::continuousCircuit; + if (ride->mode == RideMode::poweredLaunchBlockSectioned) { - newMode = RideMode::PoweredLaunch; + newMode = RideMode::poweredLaunch; } auto rideSetSetting = RideSetSettingAction(ride->id, RideSetSetting::Mode, static_cast(newMode)); diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index cda3256550..38e23ce9d6 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -2500,7 +2500,7 @@ static void PeepChooseSeatFromCar(Peep* peep, const Ride& ride, Vehicle* vehicle } uint8_t chosen_seat = vehicle->next_free_seat; - if (ride.mode == RideMode::ForwardRotation || ride.mode == RideMode::BackwardRotation) + if (ride.mode == RideMode::forwardRotation || ride.mode == RideMode::backwardRotation) { chosen_seat = (((~vehicle->Pitch + 1) >> 3) & 0xF) * 2; if (vehicle->next_free_seat & 1) @@ -2564,7 +2564,7 @@ static bool FindVehicleToEnter( { uint8_t chosen_train = RideStation::kNoTrain; - if (ride.mode == RideMode::Dodgems || ride.mode == RideMode::Race) + if (ride.mode == RideMode::dodgems || ride.mode == RideMode::race) { if (ride.lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) return false; @@ -2615,7 +2615,7 @@ static bool FindVehicleToEnter( if (num_seats == vehicle->next_free_seat) continue; - if (ride.mode == RideMode::ForwardRotation || ride.mode == RideMode::BackwardRotation) + if (ride.mode == RideMode::forwardRotation || ride.mode == RideMode::backwardRotation) { uint8_t position = (((~vehicle->Pitch + 1) >> 3) & 0xF) * 2; if (!vehicle->peep[position].IsNull()) @@ -4031,7 +4031,7 @@ void Guest::UpdateRideFreeVehicleCheck() return; } - if (ride->mode == RideMode::ForwardRotation || ride->mode == RideMode::BackwardRotation) + if (ride->mode == RideMode::forwardRotation || ride->mode == RideMode::backwardRotation) { if (CurrentSeat & 1 || !(vehicle->next_free_seat & 1)) { @@ -4059,7 +4059,7 @@ void Guest::UpdateRideFreeVehicleCheck() return; } - if (ride->mode != RideMode::ForwardRotation && ride->mode != RideMode::BackwardRotation) + if (ride->mode != RideMode::forwardRotation && ride->mode != RideMode::backwardRotation) { if (vehicle->next_free_seat - 1 != CurrentSeat) return; @@ -4095,7 +4095,7 @@ void Guest::UpdateRideEnterVehicle() return; } - if (ride->mode != RideMode::ForwardRotation && ride->mode != RideMode::BackwardRotation) + if (ride->mode != RideMode::forwardRotation && ride->mode != RideMode::backwardRotation) { if (CurrentSeat != vehicle->num_peeps) return; @@ -4160,7 +4160,7 @@ void Guest::UpdateRideLeaveVehicle() } // Check if ride is NOT Ferris Wheel. - if (ride->mode != RideMode::ForwardRotation && ride->mode != RideMode::BackwardRotation) + if (ride->mode != RideMode::forwardRotation && ride->mode != RideMode::backwardRotation) { if (vehicle->num_peeps - 1 != CurrentSeat) return; @@ -4699,7 +4699,7 @@ void Guest::UpdateRideApproachSpiralSlide() lastRide = true; else if (CurrentCar++ != 0) { - if (ride->mode == RideMode::SingleRidePerAdmission) + if (ride->mode == RideMode::singleRidePerAdmission) lastRide = true; if (static_cast(CurrentCar - 1) > (ScenarioRand() & 0xF)) lastRide = true; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 5b4dd16ec1..a23993cab0 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -174,7 +174,7 @@ static void ConsoleCommandRides(InteractiveConsole& console, const arguments_t& if (argv.size() > 1 && argv[1] == "mode") { console.WriteFormatLine("Ride modes are specified using integer IDs as given below:"); - for (int32_t i = 0; i < static_cast(RideMode::Count); i++) + for (int32_t i = 0; i < static_cast(RideMode::count); i++) { char mode_name[128] = { 0 }; StringId mode_string_id = kRideModeNames[i]; @@ -240,7 +240,7 @@ static void ConsoleCommandRides(InteractiveConsole& console, const arguments_t& else { auto ride = GetRide(RideId::FromUnderlying(ride_index)); - if (mode >= static_cast(RideMode::Count)) + if (mode >= static_cast(RideMode::count)) { console.WriteFormatLine("Invalid ride mode."); } diff --git a/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp b/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp index 85b2d50775..547f5629a4 100644 --- a/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp +++ b/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp @@ -44,8 +44,8 @@ static void LatticeTriangleTrackAltStation( PaintSession& session, const Ride& ride, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement, SupportType supportType) { - if (ride.mode == RideMode::PoweredLaunch || ride.mode == RideMode::PoweredLaunchBlockSectioned - || ride.mode == RideMode::PoweredLaunchPasstrough) + if (ride.mode == RideMode::poweredLaunch || ride.mode == RideMode::poweredLaunchBlockSectioned + || ride.mode == RideMode::poweredLaunchPasstrough) { static constexpr uint32_t imageIds[4][2] = { { SPR_G2_LATTICE_TRIANGLE_TRACK_BOOSTER_ALT_NE_SW, SPR_STATION_BASE_A_SW_NE }, diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 69c93efaec..edde0a0561 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1017,7 +1017,7 @@ namespace OpenRCT2::RCT1 if (src->OperatingMode == RCT1_RIDE_MODE_POWERED_LAUNCH) { // Launched rides never passed through the station in RCT1. - dst->mode = RideMode::PoweredLaunch; + dst->mode = RideMode::poweredLaunch; } else { @@ -2824,7 +2824,7 @@ namespace OpenRCT2::RCT1 dst->TrackSubposition = VehicleTrackSubposition{ src->TrackSubposition }; dst->TrackLocation = { src->TrackX, src->TrackY, src->TrackZ }; dst->current_station = StationIndex::FromUnderlying(src->CurrentStation); - if (src->BoatLocation.IsNull() || ride->mode != RideMode::BoatHire || statusSrc != ::Vehicle::Status::TravellingBoat) + if (src->BoatLocation.IsNull() || ride->mode != RideMode::boatHire || statusSrc != ::Vehicle::Status::TravellingBoat) { dst->BoatLocation.SetNull(); dst->SetTrackDirection(src->GetTrackDirection()); diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index 29a3ed1370..aa362f59bd 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -135,7 +135,7 @@ namespace OpenRCT2::RCT1 td->operation.rideMode = static_cast(td4Base.Mode); if (td4Base.Mode == RCT1_RIDE_MODE_POWERED_LAUNCH) { - td->operation.rideMode = RideMode::PoweredLaunch; + td->operation.rideMode = RideMode::poweredLaunch; } std::string_view vehicleObject; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 85ad178496..805f37d323 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1937,7 +1937,7 @@ namespace OpenRCT2::RCT2 dst->colours.Tertiary = src->ColoursExtended; dst->track_progress = src->TrackProgress; dst->TrackLocation = { src->TrackX, src->TrackY, src->TrackZ }; - if (src->BoatLocation.IsNull() || static_cast(ride.Mode) != RideMode::BoatHire + if (src->BoatLocation.IsNull() || static_cast(ride.Mode) != RideMode::boatHire || src->Status != static_cast(::Vehicle::Status::TravellingBoat)) { dst->BoatLocation.SetNull(); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 8b766886c2..2ad52d4de4 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -90,7 +90,7 @@ using namespace OpenRCT2::TrackMetaData; RideMode& operator++(RideMode& d, int) { - return d = (d == RideMode::Count) ? RideMode::Normal : static_cast(static_cast(d) + 1); + return d = (d == RideMode::count) ? RideMode::normal : static_cast(static_cast(d) + 1); } static constexpr int32_t RideInspectionInterval[] = { @@ -840,7 +840,7 @@ void Ride::FormatStatusTo(Formatter& ft) const { ft.Add(STR_TEST_RUN); } - else if (mode == RideMode::Race && !(lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) && !race_winner.IsNull()) + else if (mode == RideMode::race && !(lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) && !race_winner.IsNull()) { auto peep = GetEntity(race_winner); if (peep != nullptr) @@ -887,8 +887,8 @@ bool Ride::CanHaveMultipleCircuits() const return false; // Only allow circuit or launch modes - if (mode != RideMode::ContinuousCircuit && mode != RideMode::ReverseInclineLaunchedShuttle - && mode != RideMode::PoweredLaunchPasstrough) + if (mode != RideMode::continuousCircuit && mode != RideMode::reverseInclineLaunchedShuttle + && mode != RideMode::poweredLaunchPasstrough) { return false; } @@ -1126,7 +1126,7 @@ void Ride::Update() // If ride is simulating but crashed, reset the vehicles if (status == RideStatus::simulating && (lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) { - if (mode == RideMode::ContinuousCircuitBlockSectioned || mode == RideMode::PoweredLaunchBlockSectioned) + if (mode == RideMode::continuousCircuitBlockSectioned || mode == RideMode::poweredLaunchBlockSectioned) { // We require this to execute right away during the simulation, always ignore network and queue. RideSetStatusAction gameAction = RideSetStatusAction(id, RideStatus::closed); @@ -2558,14 +2558,14 @@ static ResultWithMessage RideModeCheckValidStationNumbers(const Ride& ride) switch (ride.mode) { - case RideMode::ReverseInclineLaunchedShuttle: - case RideMode::PoweredLaunchPasstrough: - case RideMode::PoweredLaunch: - case RideMode::LimPoweredLaunch: + case RideMode::reverseInclineLaunchedShuttle: + case RideMode::poweredLaunchPasstrough: + case RideMode::poweredLaunch: + case RideMode::limPoweredLaunch: if (numStations <= 1) return { true }; return { false, STR_UNABLE_TO_OPERATE_WITH_MORE_THAN_ONE_STATION_IN_THIS_MODE }; - case RideMode::Shuttle: + case RideMode::shuttle: if (numStations >= 2) return { true }; return { false, STR_UNABLE_TO_OPERATE_WITH_LESS_THAN_TWO_STATIONS_IN_THIS_MODE }; @@ -3602,7 +3602,7 @@ ResultWithMessage Ride::CreateVehicles(const CoordsXYE& element, bool isApplying int32_t direction = trackElement->GetDirection(); // - if (mode == RideMode::StationToStation) + if (mode == RideMode::stationToStation) { vehiclePos -= CoordsXYZ{ CoordsDirectionDelta[direction], 0 }; @@ -3852,7 +3852,7 @@ static ResultWithMessage RideCreateCableLift(RideId rideIndex, bool isApplying) if (ride == nullptr) return { false }; - if (ride->mode != RideMode::ContinuousCircuitBlockSectioned && ride->mode != RideMode::ContinuousCircuit) + if (ride->mode != RideMode::continuousCircuitBlockSectioned && ride->mode != RideMode::continuousCircuit) { return { false, STR_CABLE_LIFT_UNABLE_TO_WORK_IN_THIS_OPERATING_MODE }; } @@ -4603,13 +4603,13 @@ uint8_t RideGetHelixSections(const Ride& ride) bool Ride::IsPoweredLaunched() const { - return mode == RideMode::PoweredLaunchPasstrough || mode == RideMode::PoweredLaunch - || mode == RideMode::PoweredLaunchBlockSectioned; + return mode == RideMode::poweredLaunchPasstrough || mode == RideMode::poweredLaunch + || mode == RideMode::poweredLaunchBlockSectioned; } bool Ride::IsBlockSectioned() const { - return mode == RideMode::ContinuousCircuitBlockSectioned || mode == RideMode::PoweredLaunchBlockSectioned; + return mode == RideMode::continuousCircuitBlockSectioned || mode == RideMode::poweredLaunchBlockSectioned; } bool RideHasAnyTrackElements(const Ride& ride) @@ -5115,15 +5115,15 @@ void Ride::UpdateMaxVehicles() switch (mode) { - case RideMode::ContinuousCircuitBlockSectioned: - case RideMode::PoweredLaunchBlockSectioned: + case RideMode::continuousCircuitBlockSectioned: + case RideMode::poweredLaunchBlockSectioned: maxNumTrains = std::clamp(num_stations + num_block_brakes - 1, 1, OpenRCT2::Limits::kMaxTrainsPerRide); break; - case RideMode::ReverseInclineLaunchedShuttle: - case RideMode::PoweredLaunchPasstrough: - case RideMode::Shuttle: - case RideMode::LimPoweredLaunch: - case RideMode::PoweredLaunch: + case RideMode::reverseInclineLaunchedShuttle: + case RideMode::poweredLaunchPasstrough: + case RideMode::shuttle: + case RideMode::limPoweredLaunch: + case RideMode::poweredLaunch: maxNumTrains = 1; break; default: @@ -5146,7 +5146,7 @@ void Ride::UpdateMaxVehicles() totalLength += trainLength; } while (totalLength <= stationLength); - if ((mode != RideMode::StationToStation && mode != RideMode::ContinuousCircuit) + if ((mode != RideMode::stationToStation && mode != RideMode::continuousCircuit) || !(rtd.HasFlag(RtdFlag::allowMoreVehiclesThanStationFits))) { maxNumTrains = std::min(maxNumTrains, int32_t(OpenRCT2::Limits::kMaxTrainsPerRide)); @@ -5916,7 +5916,7 @@ ResultWithMessage Ride::ChangeStatusGetStartElement(StationIndex stationIndex, C ResultWithMessage Ride::ChangeStatusCheckCompleteCircuit(const CoordsXYE& trackElement) { CoordsXYE problematicTrackElement = {}; - if (mode == RideMode::Race || mode == RideMode::ContinuousCircuit || IsBlockSectioned()) + if (mode == RideMode::race || mode == RideMode::continuousCircuit || IsBlockSectioned()) { if (FindTrackGap(trackElement, &problematicTrackElement)) { @@ -5967,7 +5967,7 @@ ResultWithMessage Ride::ChangeStatusCheckTrackValidity(const CoordsXYE& trackEle } } - if (mode == RideMode::StationToStation) + if (mode == RideMode::stationToStation) { if (!FindTrackGap(trackElement, &problematicTrackElement)) { diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index ba50457ef0..79df4dbd0c 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -637,46 +637,46 @@ enum class RideStatus : uint8_t enum class RideMode : uint8_t { - Normal, - ContinuousCircuit, - ReverseInclineLaunchedShuttle, - PoweredLaunchPasstrough, // RCT2 style, pass through station - Shuttle, - BoatHire, - UpwardLaunch, - RotatingLift, - StationToStation, - SingleRidePerAdmission, - UnlimitedRidesPerAdmission = 10, - Maze, - Race, - Dodgems, - Swing, - ShopStall, - Rotation, - ForwardRotation, - BackwardRotation, - FilmAvengingAviators, - MouseTails3DFilm = 20, - SpaceRings, - Beginners, - LimPoweredLaunch, - FilmThrillRiders, - StormChasers3DFilm, - SpaceRaiders3DFilm, - Intense, - Berserk, - HauntedHouse, - Circus = 30, - DownwardLaunch, - CrookedHouse, - FreefallDrop, - ContinuousCircuitBlockSectioned, - PoweredLaunch, // RCT1 style, don't pass through station - PoweredLaunchBlockSectioned, + normal, + continuousCircuit, + reverseInclineLaunchedShuttle, + poweredLaunchPasstrough, // RCT2 style, pass through station + shuttle, + boatHire, + upwardLaunch, + rotatingLift, + stationToStation, + singleRidePerAdmission, + unlimitedRidesPerAdmission = 10, + maze, + race, + dodgems, + swing, + shopStall, + rotation, + forwardRotation, + backwardRotation, + filmAvengingAviators, + mouseTails3DFilm = 20, + spaceRings, + beginners, + limPoweredLaunch, + filmThrillRiders, + stormChasers3DFilm, + spaceRaiders3DFilm, + intense, + berserk, + hauntedHouse, + circus = 30, + downwardLaunch, + crookedHouse, + freefallDrop, + continuousCircuitBlockSectioned, + poweredLaunch, // RCT1 style, don't pass through station + poweredLaunchBlockSectioned, - Count, - NullMode = 255, + count, + nullMode = 255, }; RideMode& operator++(RideMode& d, int); diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 42e16a7f2f..e6a6096e8f 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -586,21 +586,21 @@ constexpr const RideComponentName& GetRideComponentName(const RideComponentType } constexpr uint64_t kAllRideModesAvailable = EnumsToFlags( - RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle, - RideMode::PoweredLaunchPasstrough, RideMode::Shuttle, RideMode::Normal, RideMode::BoatHire, RideMode::UpwardLaunch, - RideMode::RotatingLift, RideMode::StationToStation, RideMode::SingleRidePerAdmission, RideMode::UnlimitedRidesPerAdmission, - RideMode::Maze, RideMode::Race, RideMode::Dodgems, RideMode::Swing, RideMode::ShopStall, RideMode::Rotation, - RideMode::ForwardRotation, RideMode::BackwardRotation, RideMode::FilmAvengingAviators, RideMode::MouseTails3DFilm, - RideMode::SpaceRings, RideMode::Beginners, RideMode::LimPoweredLaunch, RideMode::FilmThrillRiders, - RideMode::StormChasers3DFilm, RideMode::SpaceRaiders3DFilm, RideMode::Intense, RideMode::Berserk, RideMode::HauntedHouse, - RideMode::Circus, RideMode::DownwardLaunch, RideMode::CrookedHouse, RideMode::FreefallDrop, RideMode::PoweredLaunch, - RideMode::PoweredLaunchBlockSectioned); + RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::reverseInclineLaunchedShuttle, + RideMode::poweredLaunchPasstrough, RideMode::shuttle, RideMode::normal, RideMode::boatHire, RideMode::upwardLaunch, + RideMode::rotatingLift, RideMode::stationToStation, RideMode::singleRidePerAdmission, RideMode::unlimitedRidesPerAdmission, + RideMode::maze, RideMode::race, RideMode::dodgems, RideMode::swing, RideMode::shopStall, RideMode::rotation, + RideMode::forwardRotation, RideMode::backwardRotation, RideMode::filmAvengingAviators, RideMode::mouseTails3DFilm, + RideMode::spaceRings, RideMode::beginners, RideMode::limPoweredLaunch, RideMode::filmThrillRiders, + RideMode::stormChasers3DFilm, RideMode::spaceRaiders3DFilm, RideMode::intense, RideMode::berserk, RideMode::hauntedHouse, + RideMode::circus, RideMode::downwardLaunch, RideMode::crookedHouse, RideMode::freefallDrop, RideMode::poweredLaunch, + RideMode::poweredLaunchBlockSectioned); extern const CarEntry kCableLiftVehicle; extern const uint16_t kRideFilmLength[3]; -extern const StringId kRideModeNames[EnumValue(RideMode::Count)]; +extern const StringId kRideModeNames[EnumValue(RideMode::count)]; // clang-format off constexpr RideTypeDescriptor kDummyRTD = @@ -610,8 +610,8 @@ constexpr RideTypeDescriptor kDummyRTD = .TrackPaintFunctions = {}, .InvertedTrackPaintFunctions = {}, .Flags = 0, - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = {}, .TrackSpeedSettings = {}, .BoosterSettings = {}, diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 3633fc1cba..3ed8be4322 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -1239,19 +1239,19 @@ static money64 RideComputeUpkeep(RideRatingUpdateState& state, const Ride& ride) // flume/rapids, 10 for roller coaster, 28 for giga coaster upkeep += ride.GetRideTypeDescriptor().UpkeepCosts.CostPerStation * ride.num_stations; - if (ride.mode == RideMode::ReverseInclineLaunchedShuttle) + if (ride.mode == RideMode::reverseInclineLaunchedShuttle) { upkeep += 30; } - else if (ride.mode == RideMode::PoweredLaunchPasstrough) + else if (ride.mode == RideMode::poweredLaunchPasstrough) { upkeep += 160; } - else if (ride.mode == RideMode::LimPoweredLaunch) + else if (ride.mode == RideMode::limPoweredLaunch) { upkeep += 320; } - else if (ride.mode == RideMode::PoweredLaunch || ride.mode == RideMode::PoweredLaunchBlockSectioned) + else if (ride.mode == RideMode::poweredLaunch || ride.mode == RideMode::poweredLaunchBlockSectioned) { upkeep += 220; } @@ -1352,7 +1352,7 @@ static void RideRatingsApplyIntensityPenalty(RatingTuple& ratings) static void SetUnreliabilityFactor(Ride& ride) { // Special unreliability for a few ride types - if (ride.type == RIDE_TYPE_COMPACT_INVERTED_COASTER && ride.mode == RideMode::ReverseInclineLaunchedShuttle) + if (ride.type == RIDE_TYPE_COMPACT_INVERTED_COASTER && ride.mode == RideMode::reverseInclineLaunchedShuttle) { ride.unreliability_factor += 10; } @@ -1934,7 +1934,7 @@ static void RideRatingsApplyBonusReversedTrains(RatingTuple& ratings, const Ride static void RideRatingsApplyBonusGoKartRace(RatingTuple& ratings, const Ride& ride, RatingsModifier modifier) { - if (ride.mode == RideMode::Race && ride.NumTrains >= modifier.threshold) + if (ride.mode == RideMode::race && ride.NumTrains >= modifier.threshold) { RideRatingsAdd(ratings, modifier.excitement, modifier.intensity, modifier.nausea); @@ -1974,7 +1974,7 @@ static void RideRatingsApplyBonusBoatHireNoCircuit(RatingTuple& ratings, const R static void RideRatingsApplyBonusSlideUnlimitedRides(RatingTuple& ratings, const Ride& ride, RatingsModifier modifier) { - if (ride.mode == RideMode::UnlimitedRidesPerAdmission) + if (ride.mode == RideMode::unlimitedRidesPerAdmission) { RideRatingsAdd(ratings, modifier.excitement, modifier.intensity, modifier.nausea); } @@ -1983,7 +1983,7 @@ static void RideRatingsApplyBonusSlideUnlimitedRides(RatingTuple& ratings, const static void RideRatingsApplyBonusMotionSimulatorMode(RatingTuple& ratings, const Ride& ride, RatingsModifier modifier) { // Hardcoded until ride mode refactor - if (ride.mode == RideMode::FilmThrillRiders) + if (ride.mode == RideMode::filmThrillRiders) { RideRatingsSet(ratings, MakeRideRating(3, 25), MakeRideRating(4, 10), MakeRideRating(3, 30)); } @@ -1999,13 +1999,13 @@ static void RideRatingsApplyBonus3DCinemaMode(RatingTuple& ratings, const Ride& switch (ride.mode) { default: - case RideMode::MouseTails3DFilm: + case RideMode::mouseTails3DFilm: RideRatingsSet(ratings, MakeRideRating(3, 50), MakeRideRating(2, 40), MakeRideRating(1, 40)); break; - case RideMode::StormChasers3DFilm: + case RideMode::stormChasers3DFilm: RideRatingsSet(ratings, MakeRideRating(4, 00), MakeRideRating(2, 65), MakeRideRating(1, 55)); break; - case RideMode::SpaceRaiders3DFilm: + case RideMode::spaceRaiders3DFilm: RideRatingsSet(ratings, MakeRideRating(4, 20), MakeRideRating(2, 60), MakeRideRating(1, 48)); break; } @@ -2017,13 +2017,13 @@ static void RideRatingsApplyBonusTopSpinMode(RatingTuple& ratings, const Ride& r switch (ride.mode) { default: - case RideMode::Beginners: + case RideMode::beginners: RideRatingsSet(ratings, MakeRideRating(2, 00), MakeRideRating(4, 80), MakeRideRating(5, 74)); break; - case RideMode::Intense: + case RideMode::intense: RideRatingsSet(ratings, MakeRideRating(3, 00), MakeRideRating(5, 75), MakeRideRating(6, 64)); break; - case RideMode::Berserk: + case RideMode::berserk: RideRatingsSet(ratings, MakeRideRating(3, 20), MakeRideRating(6, 80), MakeRideRating(7, 94)); break; } @@ -2055,7 +2055,7 @@ static void RideRatingsApplyBonusNumTrains(RatingTuple& ratings, const Ride& rid static void RideRatingsApplyBonusDownwardLaunch(RatingTuple& ratings, const Ride& ride, RatingsModifier modifier) { - if (ride.mode == RideMode::DownwardLaunch) + if (ride.mode == RideMode::downwardLaunch) { RideRatingsAdd(ratings, modifier.excitement, modifier.intensity, modifier.nausea); } @@ -2078,7 +2078,7 @@ static void RideRatingsApplyBonusLaunchedFreefallSpecial( RideRatingsApplyBonusOperationOptionFreefall(ratings, ride, modifier); #else // Only apply "launch speed" effects when the setting can be modified - if (ride.mode == RideMode::UpwardLaunch) + if (ride.mode == RideMode::upwardLaunch) { RideRatingsApplyBonusOperationOptionFreefall(ratings, ride, modifier); } diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index ff68b5cd09..3d89a439cd 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -39,14 +39,14 @@ void RideUpdateStation(Ride& ride, StationIndex stationIndex) switch (ride.mode) { - case RideMode::Race: + case RideMode::race: RideUpdateStationRace(ride, stationIndex); break; - case RideMode::Dodgems: + case RideMode::dodgems: RideUpdateStationDodgems(ride, stationIndex); break; - case RideMode::ContinuousCircuitBlockSectioned: - case RideMode::PoweredLaunchBlockSectioned: + case RideMode::continuousCircuitBlockSectioned: + case RideMode::poweredLaunchBlockSectioned: RideUpdateStationBlockSection(ride, stationIndex); break; default: diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 22db95f165..93e8745e92 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -1360,10 +1360,10 @@ void Vehicle::UpdateMovingToEndOfStation() switch (curRide->mode) { - case RideMode::UpwardLaunch: - case RideMode::RotatingLift: - case RideMode::DownwardLaunch: - case RideMode::FreefallDrop: + case RideMode::upwardLaunch: + case RideMode::rotatingLift: + case RideMode::downwardLaunch: + case RideMode::freefallDrop: if (velocity >= -131940) { acceleration = -3298; @@ -1377,23 +1377,23 @@ void Vehicle::UpdateMovingToEndOfStation() if (!(curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_5)) break; [[fallthrough]]; - case RideMode::Dodgems: - case RideMode::Swing: - case RideMode::Rotation: - case RideMode::ForwardRotation: - case RideMode::BackwardRotation: - case RideMode::FilmAvengingAviators: - case RideMode::FilmThrillRiders: - case RideMode::Beginners: - case RideMode::Intense: - case RideMode::Berserk: - case RideMode::MouseTails3DFilm: - case RideMode::StormChasers3DFilm: - case RideMode::SpaceRaiders3DFilm: - case RideMode::SpaceRings: - case RideMode::HauntedHouse: - case RideMode::CrookedHouse: - case RideMode::Circus: + case RideMode::dodgems: + case RideMode::swing: + case RideMode::rotation: + case RideMode::forwardRotation: + case RideMode::backwardRotation: + case RideMode::filmAvengingAviators: + case RideMode::filmThrillRiders: + case RideMode::beginners: + case RideMode::intense: + case RideMode::berserk: + case RideMode::mouseTails3DFilm: + case RideMode::stormChasers3DFilm: + case RideMode::spaceRaiders3DFilm: + case RideMode::spaceRings: + case RideMode::hauntedHouse: + case RideMode::crookedHouse: + case RideMode::circus: current_station = StationIndex::FromUnderlying(0); velocity = 0; acceleration = 0; @@ -1430,7 +1430,7 @@ void Vehicle::UpdateMovingToEndOfStation() acceleration = 0; sub_state++; - if (curRide->mode == RideMode::Race && sub_state >= 40) + if (curRide->mode == RideMode::race && sub_state >= 40) { SetState(Vehicle::Status::WaitingForPassengers); break; @@ -1487,7 +1487,7 @@ void Vehicle::TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_se } } - if (curRide->mode == RideMode::ForwardRotation || curRide->mode == RideMode::BackwardRotation) + if (curRide->mode == RideMode::forwardRotation || curRide->mode == RideMode::backwardRotation) { uint8_t seat = ((-Pitch) / 8) & 0xF; if (!peep[seat].IsNull()) @@ -1777,7 +1777,7 @@ void Vehicle::UpdateWaitingToDepart() bool skipCheck = false; if (shouldBreak || curRide->status != RideStatus::open) { - if (curRide->mode == RideMode::ForwardRotation || curRide->mode == RideMode::BackwardRotation) + if (curRide->mode == RideMode::forwardRotation || curRide->mode == RideMode::backwardRotation) { uint8_t seat = ((-Pitch) >> 3) & 0xF; if (peep[seat * 2].IsNull()) @@ -1854,48 +1854,48 @@ void Vehicle::UpdateWaitingToDepart() switch (curRide->mode) { - case RideMode::Dodgems: + case RideMode::dodgems: // Dodgems mode uses sub_state and TimeActive to tell how long // the vehicle has been ridden. SetState(Vehicle::Status::TravellingDodgems); TimeActive = 0; UpdateDodgemsMode(); break; - case RideMode::Swing: + case RideMode::swing: SetState(Vehicle::Status::Swinging); NumSwings = 0; current_time = -1; UpdateSwinging(); break; - case RideMode::Rotation: + case RideMode::rotation: SetState(Vehicle::Status::Rotating); NumRotations = 0; current_time = -1; UpdateRotating(); break; - case RideMode::FilmAvengingAviators: + case RideMode::filmAvengingAviators: SetState(Vehicle::Status::SimulatorOperating); current_time = -1; UpdateSimulatorOperating(); break; - case RideMode::FilmThrillRiders: + case RideMode::filmThrillRiders: SetState(Vehicle::Status::SimulatorOperating, 1); current_time = -1; UpdateSimulatorOperating(); break; - case RideMode::Beginners: - case RideMode::Intense: - case RideMode::Berserk: + case RideMode::beginners: + case RideMode::intense: + case RideMode::berserk: SetState(Vehicle::Status::TopSpinOperating, sub_state); switch (curRide->mode) { - case RideMode::Beginners: + case RideMode::beginners: sub_state = 0; break; - case RideMode::Intense: + case RideMode::intense: sub_state = 1; break; - case RideMode::Berserk: + case RideMode::berserk: sub_state = 2; break; default: @@ -1909,27 +1909,27 @@ void Vehicle::UpdateWaitingToDepart() bank_rotation = 0; UpdateTopSpinOperating(); break; - case RideMode::ForwardRotation: - case RideMode::BackwardRotation: + case RideMode::forwardRotation: + case RideMode::backwardRotation: SetState(Vehicle::Status::FerrisWheelRotating, Pitch); NumRotations = 0; ferris_wheel_var_0 = 8; ferris_wheel_var_1 = 8; UpdateFerrisWheelRotating(); break; - case RideMode::MouseTails3DFilm: - case RideMode::StormChasers3DFilm: - case RideMode::SpaceRaiders3DFilm: + case RideMode::mouseTails3DFilm: + case RideMode::stormChasers3DFilm: + case RideMode::spaceRaiders3DFilm: SetState(Vehicle::Status::ShowingFilm, sub_state); switch (curRide->mode) { - case RideMode::MouseTails3DFilm: + case RideMode::mouseTails3DFilm: sub_state = 0; break; - case RideMode::StormChasers3DFilm: + case RideMode::stormChasers3DFilm: sub_state = 1; break; - case RideMode::SpaceRaiders3DFilm: + case RideMode::spaceRaiders3DFilm: sub_state = 2; break; default: @@ -1941,24 +1941,24 @@ void Vehicle::UpdateWaitingToDepart() current_time = -1; UpdateShowingFilm(); break; - case RideMode::Circus: + case RideMode::circus: SetState(Vehicle::Status::DoingCircusShow); current_time = -1; UpdateDoingCircusShow(); break; - case RideMode::SpaceRings: + case RideMode::spaceRings: SetState(Vehicle::Status::SpaceRingsOperating); Pitch = 0; current_time = -1; UpdateSpaceRingsOperating(); break; - case RideMode::HauntedHouse: + case RideMode::hauntedHouse: SetState(Vehicle::Status::HauntedHouseOperating); Pitch = 0; current_time = -1; UpdateHauntedHouseOperating(); break; - case RideMode::CrookedHouse: + case RideMode::crookedHouse: SetState(Vehicle::Status::CrookedHouseOperating); Pitch = 0; current_time = -1; @@ -2520,7 +2520,7 @@ void Vehicle::UpdateDeparting() OpenRCT2::Audio::Play3D(soundId, GetLocation()); } - if (curRide->mode == RideMode::UpwardLaunch || (curRide->mode == RideMode::DownwardLaunch && NumLaunches > 1)) + if (curRide->mode == RideMode::upwardLaunch || (curRide->mode == RideMode::downwardLaunch && NumLaunches > 1)) { OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch2, GetLocation()); } @@ -2550,21 +2550,21 @@ void Vehicle::UpdateDeparting() const auto& rtd = curRide->GetRideTypeDescriptor(); switch (curRide->mode) { - case RideMode::ReverseInclineLaunchedShuttle: + case RideMode::reverseInclineLaunchedShuttle: if (velocity >= -131940) acceleration = -3298; break; - case RideMode::PoweredLaunchPasstrough: - case RideMode::PoweredLaunch: - case RideMode::PoweredLaunchBlockSectioned: - case RideMode::LimPoweredLaunch: - case RideMode::UpwardLaunch: + case RideMode::poweredLaunchPasstrough: + case RideMode::poweredLaunch: + case RideMode::poweredLaunchBlockSectioned: + case RideMode::limPoweredLaunch: + case RideMode::upwardLaunch: if ((curRide->launch_speed << 16) > velocity) { acceleration = curRide->launch_speed << rtd.BoosterSettings.AccelerationFactor; } break; - case RideMode::DownwardLaunch: + case RideMode::downwardLaunch: if (NumLaunches >= 1) { if ((14 << 16) > velocity) @@ -2572,11 +2572,11 @@ void Vehicle::UpdateDeparting() break; } [[fallthrough]]; - case RideMode::ContinuousCircuit: - case RideMode::ContinuousCircuitBlockSectioned: - case RideMode::RotatingLift: - case RideMode::FreefallDrop: - case RideMode::BoatHire: + case RideMode::continuousCircuit: + case RideMode::continuousCircuitBlockSectioned: + case RideMode::rotatingLift: + case RideMode::freefallDrop: + case RideMode::boatHire: if (carEntry.flags & CAR_ENTRY_FLAG_POWERED) break; @@ -2594,7 +2594,7 @@ void Vehicle::UpdateDeparting() if (curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_8) { - if (curRide->mode == RideMode::ReverseInclineLaunchedShuttle) + if (curRide->mode == RideMode::reverseInclineLaunchedShuttle) { velocity = -velocity; FinishDeparting(); @@ -2604,18 +2604,18 @@ void Vehicle::UpdateDeparting() if (curFlags & (VEHICLE_UPDATE_MOTION_TRACK_FLAG_5 | VEHICLE_UPDATE_MOTION_TRACK_FLAG_12)) { - if (curRide->mode == RideMode::BoatHire) + if (curRide->mode == RideMode::boatHire) { UpdateDepartingBoatHire(); return; } - if (curRide->mode == RideMode::ReverseInclineLaunchedShuttle) + if (curRide->mode == RideMode::reverseInclineLaunchedShuttle) { velocity = -velocity; FinishDeparting(); return; } - if (curRide->mode == RideMode::Shuttle) + if (curRide->mode == RideMode::shuttle) { Flags ^= VehicleFlags::PoweredCarInReverse; velocity = 0; @@ -2628,7 +2628,7 @@ void Vehicle::UpdateDeparting() if (curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_ON_LIFT_HILL) { sound2_flags |= VEHICLE_SOUND2_FLAGS_LIFT_HILL; - if (curRide->mode != RideMode::ReverseInclineLaunchedShuttle) + if (curRide->mode != RideMode::reverseInclineLaunchedShuttle) { int32_t curSpeed = curRide->lift_hill_speed * 31079; if (velocity <= curSpeed) @@ -2666,14 +2666,14 @@ void Vehicle::UpdateDeparting() } } - if (curRide->mode == RideMode::FreefallDrop) + if (curRide->mode == RideMode::freefallDrop) { animation_frame++; } else { bool shouldLaunch = true; - if (curRide->mode == RideMode::DownwardLaunch) + if (curRide->mode == RideMode::downwardLaunch) { if (NumLaunches < 1) shouldLaunch = false; @@ -2689,8 +2689,8 @@ void Vehicle::UpdateDeparting() if (!(curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_5)) return; - if (curRide->mode == RideMode::BoatHire || curRide->mode == RideMode::RotatingLift - || curRide->mode == RideMode::Shuttle) + if (curRide->mode == RideMode::boatHire || curRide->mode == RideMode::rotatingLift + || curRide->mode == RideMode::shuttle) return; UpdateCrashSetup(); @@ -2700,7 +2700,7 @@ void Vehicle::UpdateDeparting() if (!CurrentTowerElementIsTop()) { - if (curRide->mode == RideMode::FreefallDrop) + if (curRide->mode == RideMode::freefallDrop) Invalidate(); return; } @@ -2723,7 +2723,7 @@ void Vehicle::FinishDeparting() if (curRide == nullptr) return; - if (curRide->mode == RideMode::DownwardLaunch) + if (curRide->mode == RideMode::downwardLaunch) { if (NumLaunches >= 1 && (14 << 16) > velocity) return; @@ -2731,7 +2731,7 @@ void Vehicle::FinishDeparting() OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch1, GetLocation()); } - if (curRide->mode == RideMode::UpwardLaunch) + if (curRide->mode == RideMode::upwardLaunch) { if ((curRide->launch_speed << 16) > velocity) return; @@ -2739,7 +2739,7 @@ void Vehicle::FinishDeparting() OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch1, GetLocation()); } - if (curRide->mode != RideMode::Race && !curRide->IsBlockSectioned()) + if (curRide->mode != RideMode::race && !curRide->IsBlockSectioned()) { auto& currentStation = curRide->GetStation(current_station); currentStation.Depart &= kStationDepartFlag; @@ -2998,7 +2998,7 @@ void Vehicle::UpdateTravelling() CheckIfMissing(); auto curRide = GetRide(); - if (curRide == nullptr || (_vehicleBreakdown == 0 && curRide->mode == RideMode::RotatingLift)) + if (curRide == nullptr || (_vehicleBreakdown == 0 && curRide->mode == RideMode::rotatingLift)) return; if (sub_state == 2) @@ -3010,7 +3010,7 @@ void Vehicle::UpdateTravelling() sub_state = 0; } - if (curRide->mode == RideMode::FreefallDrop && animation_frame != 0) + if (curRide->mode == RideMode::freefallDrop && animation_frame != 0) { animation_frame++; velocity = 0; @@ -3023,7 +3023,7 @@ void Vehicle::UpdateTravelling() bool skipCheck = false; if (curFlags & (VEHICLE_UPDATE_MOTION_TRACK_FLAG_8 | VEHICLE_UPDATE_MOTION_TRACK_FLAG_9) - && curRide->mode == RideMode::ReverseInclineLaunchedShuttle && sub_state == 0) + && curRide->mode == RideMode::reverseInclineLaunchedShuttle && sub_state == 0) { sub_state = 1; velocity = 0; @@ -3046,7 +3046,7 @@ void Vehicle::UpdateTravelling() if (curFlags & (VEHICLE_UPDATE_MOTION_TRACK_FLAG_5 | VEHICLE_UPDATE_MOTION_TRACK_FLAG_12)) { - if (curRide->mode == RideMode::RotatingLift) + if (curRide->mode == RideMode::rotatingLift) { if (sub_state <= 1) { @@ -3055,12 +3055,12 @@ void Vehicle::UpdateTravelling() return; } } - else if (curRide->mode == RideMode::BoatHire) + else if (curRide->mode == RideMode::boatHire) { UpdateTravellingBoatHireSetup(); return; } - if (curRide->mode == RideMode::Shuttle) + if (curRide->mode == RideMode::shuttle) { Flags ^= VehicleFlags::PoweredCarInReverse; velocity = 0; @@ -3078,7 +3078,7 @@ void Vehicle::UpdateTravelling() } } - if (curRide->mode == RideMode::RotatingLift && sub_state <= 1) + if (curRide->mode == RideMode::rotatingLift && sub_state <= 1) { if (sub_state == 0) { @@ -3104,7 +3104,7 @@ void Vehicle::UpdateTravelling() if (curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_ON_LIFT_HILL) { - if (curRide->mode == RideMode::ReverseInclineLaunchedShuttle) + if (curRide->mode == RideMode::reverseInclineLaunchedShuttle) { if (sub_state == 0) { @@ -3151,13 +3151,13 @@ void Vehicle::UpdateTravelling() if (!(curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_3)) return; - if (curRide->mode == RideMode::ReverseInclineLaunchedShuttle && velocity >= 0 + if (curRide->mode == RideMode::reverseInclineLaunchedShuttle && velocity >= 0 && !HasFlag(VehicleFlags::ReverseInclineCompletedLap)) { return; } - if (curRide->mode == RideMode::PoweredLaunchPasstrough && velocity < 0) + if (curRide->mode == RideMode::poweredLaunchPasstrough && velocity < 0) return; SetState(Vehicle::Status::Arriving); @@ -3171,7 +3171,7 @@ void Vehicle::UpdateArrivingPassThroughStation(const Ride& curRide, const CarEnt { if (sub_state == 0) { - if (curRide.mode == RideMode::Race && curRide.lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) + if (curRide.mode == RideMode::race && curRide.lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) { return; } @@ -3238,8 +3238,8 @@ void Vehicle::UpdateArrivingPassThroughStation(const Ride& curRide, const CarEnt return; } - if (GetRideTypeDescriptor(curRide.type).HasFlag(RtdFlag::allowMultipleCircuits) && curRide.mode != RideMode::Shuttle - && curRide.mode != RideMode::PoweredLaunch) + if (GetRideTypeDescriptor(curRide.type).HasFlag(RtdFlag::allowMultipleCircuits) && curRide.mode != RideMode::shuttle + && curRide.mode != RideMode::poweredLaunch) { SetFlag(VehicleFlags::ReverseInclineCompletedLap); } @@ -3266,22 +3266,22 @@ void Vehicle::UpdateArriving() switch (curRide->mode) { - case RideMode::Swing: - case RideMode::Rotation: - case RideMode::ForwardRotation: - case RideMode::BackwardRotation: - case RideMode::FilmAvengingAviators: - case RideMode::FilmThrillRiders: - case RideMode::Beginners: - case RideMode::Intense: - case RideMode::Berserk: - case RideMode::MouseTails3DFilm: - case RideMode::StormChasers3DFilm: - case RideMode::SpaceRaiders3DFilm: - case RideMode::Circus: - case RideMode::SpaceRings: - case RideMode::HauntedHouse: - case RideMode::CrookedHouse: + case RideMode::swing: + case RideMode::rotation: + case RideMode::forwardRotation: + case RideMode::backwardRotation: + case RideMode::filmAvengingAviators: + case RideMode::filmThrillRiders: + case RideMode::beginners: + case RideMode::intense: + case RideMode::berserk: + case RideMode::mouseTails3DFilm: + case RideMode::stormChasers3DFilm: + case RideMode::spaceRaiders3DFilm: + case RideMode::circus: + case RideMode::spaceRings: + case RideMode::hauntedHouse: + case RideMode::crookedHouse: ClearFlag(VehicleFlags::ReverseInclineCompletedLap); velocity = 0; acceleration = 0; @@ -3366,7 +3366,7 @@ void Vehicle::UpdateArriving() return; } - if ((curRide->mode == RideMode::UpwardLaunch || curRide->mode == RideMode::DownwardLaunch) && NumLaunches < 2) + if ((curRide->mode == RideMode::upwardLaunch || curRide->mode == RideMode::downwardLaunch) && NumLaunches < 2) { OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch2, GetLocation()); velocity = 0; @@ -3375,7 +3375,7 @@ void Vehicle::UpdateArriving() return; } - if (curRide->mode == RideMode::Race && curRide->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) + if (curRide->mode == RideMode::race && curRide->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) { SetState(Vehicle::Status::Departing, 1); return; @@ -3407,7 +3407,7 @@ void Vehicle::UpdateUnloadingPassengers() const auto& currentStation = curRide->GetStation(current_station); - if (curRide->mode == RideMode::ForwardRotation || curRide->mode == RideMode::BackwardRotation) + if (curRide->mode == RideMode::forwardRotation || curRide->mode == RideMode::backwardRotation) { uint8_t seat = ((-Pitch) >> 3) & 0xF; if (restraints_position == 255 && !peep[seat * 2].IsNull()) @@ -4133,7 +4133,7 @@ void Vehicle::UpdateFerrisWheelRotating() } uint8_t rotation = Pitch; - if (curRide->mode == RideMode::ForwardRotation) + if (curRide->mode == RideMode::forwardRotation) rotation++; else rotation--; @@ -4147,7 +4147,7 @@ void Vehicle::UpdateFerrisWheelRotating() Invalidate(); uint8_t subState = sub_state; - if (curRide->mode == RideMode::ForwardRotation) + if (curRide->mode == RideMode::forwardRotation) subState++; else subState--; @@ -4174,7 +4174,7 @@ void Vehicle::UpdateFerrisWheelRotating() return; subState = sub_state; - if (curRide->mode == RideMode::ForwardRotation) + if (curRide->mode == RideMode::forwardRotation) subState += 8; else subState -= 8; @@ -8730,7 +8730,7 @@ void Vehicle::UpdateCrossings() const // In shuttle mode, only the train head is considered to be travelling backwards // To prevent path getting blocked incorrectly, only update crossings when this is the train head - if (curRide->mode == RideMode::Shuttle && TrainHead() != this) + if (curRide->mode == RideMode::shuttle && TrainHead() != this) { return; } diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h index 4150b53885..90ea2effd9 100644 --- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h @@ -27,8 +27,8 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = }), .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), - .DefaultMode = RideMode::PoweredLaunchPasstrough, + .RideModes = EnumsToFlags(RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch), + .DefaultMode = RideMode::poweredLaunchPasstrough, .OperatingSettings = { 30, 50 }, .TrackSpeedSettings = { 60, 60 }, .BoosterSettings = { 40, 40, 13 }, diff --git a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h index 8db3c165df..c61292260d 100644 --- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h @@ -31,8 +31,8 @@ constexpr RideTypeDescriptor AlpineCoasterRTD = RtdFlag::allowMusic, RtdFlag::interestingToLookAt, RtdFlag::supportsMultipleColourSchemes, RtdFlag::canSynchroniseWithAdjacentStations, RtdFlag::hasEntranceAndExit, RtdFlag::noTestMode, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::upInclineRequiresLift), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .TrackSpeedSettings = { 10, 10 }, .Naming = { STR_RIDE_NAME_ALPINE_COASTER, STR_RIDE_DESCRIPTION_ALPINE_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h index cb72b63038..a86fffcb06 100644 --- a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h +++ b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_BOBSLEIGH_COASTER, STR_RIDE_DESCRIPTION_BOBSLEIGH_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h index c09636fb54..a488e394e9 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::allowDoorsOnTrack, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::reverseInclineLaunchedShuttle), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 17, 16 }, .LegacyBoosterSettings = { 17, 16, 1 }, .Naming = { STR_RIDE_NAME_CLASSIC_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_MINI_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h index 691ed3e95c..74e9896054 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::reverseInclineLaunchedShuttle, RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 7, 27 }, .Naming = { STR_RIDE_NAME_CLASSIC_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_STAND_UP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h index fb213cc7cd..e577e6d0ed 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 0, 68 }, .LegacyBoosterSettings = { 0, 68 }, .Naming = { STR_RIDE_NAME_CLASSIC_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_WOODEN_ROLLER_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h index 655caac098..aca4c52609 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 0, 68 }, .LegacyBoosterSettings = { 0, 68 }, .Naming = { STR_RIDE_NAME_CLASSIC_WOODEN_TWISTER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_CLASSIC_WOODEN_TWISTER_ROLLER_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h index 2f538ecf97..a67146a2bb 100644 --- a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::isSuspended), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::reverseInclineLaunchedShuttle), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 7, 27 }, .Naming = { STR_RIDE_NAME_COMPACT_INVERTED_COASTER, STR_RIDE_DESCRIPTION_COMPACT_INVERTED_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h index ed8030cd5a..e23921b4f0 100644 --- a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch, RideMode::ReverseInclineLaunchedShuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch, RideMode::reverseInclineLaunchedShuttle), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h index 08815c8573..136d388b68 100644 --- a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h @@ -35,8 +35,8 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::hasInvertedVariant, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::startConstructionInverted), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, @@ -110,8 +110,8 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = }), .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::startConstructionInverted), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h index ae7bff5135..696e24d2fd 100644 --- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h +++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor GigaCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowCableLiftHill, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .TrackSpeedSettings = { 60, 60 }, .BoosterSettings = { 17, 68 }, diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h index 2a05592475..6f4eb99169 100644 --- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h index 4dba04120a..27cc30792c 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor HybridCoasterRTD = EnumsToFlags(RtdFlag::hasTrackColourMain, RtdFlag::hasTrackColourSupports, RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 15, 52 }, .LegacyBoosterSettings = { 15, 52 }, .Naming = { STR_RIDE_NAME_HYBRID_COASTER, STR_RIDE_DESCRIPTION_HYBRID_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h index e9725751c5..8090e8d809 100644 --- a/src/openrct2/ride/rtd/coaster/HyperTwister.h +++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor HyperTwisterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .TrackSpeedSettings = { 60, 60 }, .BoosterSettings = { 17, 68 }, diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h index e6c9b2320f..b881035695 100644 --- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h +++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor HypercoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch, RideMode::ReverseInclineLaunchedShuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch, RideMode::reverseInclineLaunchedShuttle), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .TrackSpeedSettings = { 60, 60 }, .BoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h index f21941f9bf..f7e352dc2e 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::isSuspended), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_INVERTED_HAIRPIN_COASTER, STR_RIDE_DESCRIPTION_INVERTED_HAIRPIN_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h index b624612f24..71b1a47ad4 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::isSuspended, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), - .DefaultMode = RideMode::PoweredLaunchPasstrough, + .RideModes = EnumsToFlags(RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch), + .DefaultMode = RideMode::poweredLaunchPasstrough, .OperatingSettings = { 10, 33 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h index faa5ab2938..955093309b 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::isSuspended, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 7, 27 }, .BoosterSettings = { 0, 38 }, .LegacyBoosterSettings = { 0, 38 }, diff --git a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h index 9e768f4937..a60923e510 100644 --- a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::allowDoorsOnTrack, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .TrackSpeedSettings = { 30, 15 }, .BoosterSettings = { 17, 16 }, .LegacyBoosterSettings = { 17, 16, 1 }, diff --git a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h index 189cc517ef..daaea38625 100644 --- a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch, RideMode::PoweredLaunchBlockSectioned), - .DefaultMode = RideMode::PoweredLaunchPasstrough, + .RideModes = EnumsToFlags(RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch, RideMode::poweredLaunchBlockSectioned), + .DefaultMode = RideMode::poweredLaunchPasstrough, .OperatingSettings = { 10, 31 }, .BoosterSettings = { 18, 52 }, .LegacyBoosterSettings = { 18, 52 }, diff --git a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h index f815ae6de7..af8e01d262 100644 --- a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor LSMLaunchedRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowCableLiftHill, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::PoweredLaunch, RideMode::PoweredLaunchBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::poweredLaunch, RideMode::poweredLaunchBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 2, 10 }, .TrackSpeedSettings = { 60, 60 }, .BoosterSettings = { 17, 68 }, diff --git a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h index 538b990e17..f3c7c77eab 100644 --- a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h @@ -38,8 +38,8 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::hasInvertedVariant, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, @@ -109,8 +109,8 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = }), .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h index 81f66ca9f1..69e7a96aea 100644 --- a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle, RideMode::PoweredLaunchPasstrough, RideMode::PoweredLaunch), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::reverseInclineLaunchedShuttle, RideMode::poweredLaunchPasstrough, RideMode::poweredLaunch), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 18, 18 }, .LegacyBoosterSettings = { 18, 18 }, diff --git a/src/openrct2/ride/rtd/coaster/MineRide.h b/src/openrct2/ride/rtd/coaster/MineRide.h index 872fa2fc73..c125305c8e 100644 --- a/src/openrct2/ride/rtd/coaster/MineRide.h +++ b/src/openrct2/ride/rtd/coaster/MineRide.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor MineRideRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MINE_RIDE, STR_RIDE_DESCRIPTION_MINE_RIDE }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h index 78ebeb0659..a939e30fc2 100644 --- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MINE_TRAIN_COASTER, STR_RIDE_DESCRIPTION_MINE_TRAIN_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h index e0ceab5db1..62541ea4a8 100644 --- a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 0, 68 }, .LegacyBoosterSettings = { 0, 68, 4 }, .Naming = { STR_RIDE_NAME_MINI_ROLLER_COASTER, STR_RIDE_DESCRIPTION_MINI_ROLLER_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h index b17f75fdf2..9e111aee68 100644 --- a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = .Flags = kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasTrackColourMain, RtdFlag::hasTrackColourSupports, RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::isSuspended), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h index 5dc0dd93e6..f90f3dfb39 100644 --- a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h @@ -35,8 +35,8 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::hasInvertedVariant, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::hasSeatRotation, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, @@ -109,8 +109,8 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = }), .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::hasSeatRotation), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 25, 25 }, .LegacyBoosterSettings = { 25, 25 }, diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h index 6300ecc894..de30e7c052 100644 --- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::allowReversedTrains, RtdFlag::hasLsmBehaviourOnFlat), - .RideModes = EnumsToFlags(RideMode::LimPoweredLaunch), - .DefaultMode = RideMode::LimPoweredLaunch, + .RideModes = EnumsToFlags(RideMode::limPoweredLaunch), + .DefaultMode = RideMode::limPoweredLaunch, .OperatingSettings = { 7, 30 }, .TrackSpeedSettings = { 60, 60 }, .BoosterSettings = { 40, 40 }, diff --git a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h index c41c49fd88..6e33d16a95 100644 --- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::layeredVehiclePreview), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_REVERSER_ROLLER_COASTER, STR_RIDE_DESCRIPTION_REVERSER_ROLLER_COASTER }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h index 31959f4547..7fff5f0b49 100644 --- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SIDE_FRICTION_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SIDE_FRICTION_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h index ff12b2881a..490e5c1d55 100644 --- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt| EnumsToFlags(RtdFlag::hasTrackColourSupports, RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 15, 52 }, .LegacyBoosterSettings = { 15, 52 }, .Naming = { STR_RIDE_NAME_SINGLE_RAIL_ROLLER_COASTER, STR_RIDE_DESCRIPTION_SINGLE_RAIL_ROLLER_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h index 5b3c21321d..942c73f69f 100644 --- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SPINNING_WILD_MOUSE, STR_RIDE_DESCRIPTION_SPINNING_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h index ffa6e13a39..5024b38538 100644 --- a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 17, 17 }, .LegacyBoosterSettings = { 17, 17 }, diff --git a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h index bfcef879d9..f841297a9d 100644 --- a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 7, 27 }, .Naming = { STR_RIDE_NAME_STAND_UP_ROLLER_COASTER, STR_RIDE_DESCRIPTION_STAND_UP_ROLLER_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h index be6344a780..3eae87ab8f 100644 --- a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::allowDoorsOnTrack, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/Steeplechase.h b/src/openrct2/ride/rtd/coaster/Steeplechase.h index 474bb903a2..50ffc11d86 100644 --- a/src/openrct2/ride/rtd/coaster/Steeplechase.h +++ b/src/openrct2/ride/rtd/coaster/Steeplechase.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor SteeplechaseRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h index 4679333a35..224bd06bcb 100644 --- a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::isSuspended), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SUSPENDED_SWINGING_COASTER, STR_RIDE_DESCRIPTION_SUSPENDED_SWINGING_COASTER }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h index 5d84ae6e78..aa5181b912 100644 --- a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 17, 68 }, .LegacyBoosterSettings = { 17, 68 }, diff --git a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h index 8be8ac8eef..577d819aae 100644 --- a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h +++ b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .OperatingSettings = { 10, 27 }, .BoosterSettings = { 17, 68 }, .LegacyBoosterSettings = { 17, 68 }, diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h index 23223189cb..046844d3c2 100644 --- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h +++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor VirginiaReelRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_VIRGINIA_REEL, STR_RIDE_DESCRIPTION_VIRGINIA_REEL }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/coaster/WaterCoaster.h b/src/openrct2/ride/rtd/coaster/WaterCoaster.h index b47592aa59..860090894c 100644 --- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h @@ -42,8 +42,8 @@ constexpr RideTypeDescriptor WaterCoasterRTD = .InvertedTrackPaintFunctions = {}, .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::hasCoveredPieces, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned), + .DefaultMode = RideMode::continuousCircuit, .TrackSpeedSettings = { 30, 15 }, .BoosterSettings = { 17, 16 }, .LegacyBoosterSettings = { 17, 16, 1 }, diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h index 59196b30ae..90ebee1a4b 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = .Flags = kRtdFlagsHasThreeColours | kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::checkGForces, RtdFlag::allowMultipleCircuits, RtdFlag::allowReversedTrains), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::ContinuousCircuitBlockSectioned, RideMode::ReverseInclineLaunchedShuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::continuousCircuitBlockSectioned, RideMode::reverseInclineLaunchedShuttle), + .DefaultMode = RideMode::continuousCircuit, .BoosterSettings = { 0, 68 }, .LegacyBoosterSettings = { 0, 68 }, .Naming = { STR_RIDE_NAME_WOODEN_ROLLER_COASTER, STR_RIDE_DESCRIPTION_WOODEN_ROLLER_COASTER }, diff --git a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h index 59438d4525..a7873616c7 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = .Flags = kRtdFlagsCommonCoaster | kRtdFlagsCommonCoasterNonAlt | EnumsToFlags(RtdFlag::hasTrackColourMain, RtdFlag::hasTrackColourSupports, RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation, RtdFlag::allowDoorsOnTrack, RtdFlag::checkGForces), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), diff --git a/src/openrct2/ride/rtd/gentle/CarRide.h b/src/openrct2/ride/rtd/gentle/CarRide.h index 395f338777..033e0b26d7 100644 --- a/src/openrct2/ride/rtd/gentle/CarRide.h +++ b/src/openrct2/ride/rtd/gentle/CarRide.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor CarRideRTD = RtdFlag::allowDoorsOnTrack, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/gentle/Circus.h b/src/openrct2/ride/rtd/gentle/Circus.h index ab4be61691..e1d4663c95 100644 --- a/src/openrct2/ride/rtd/gentle/Circus.h +++ b/src/openrct2/ride/rtd/gentle/Circus.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor CircusRTD = RtdFlag::isFlatRide, RtdFlag::describeAsInside, RtdFlag::hasVehicleColours, RtdFlag::hasMusicByDefault, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Circus), - .DefaultMode = RideMode::Circus, + .RideModes = EnumsToFlags(RideMode::circus), + .DefaultMode = RideMode::circus, .Naming = { STR_RIDE_NAME_CIRCUS, STR_RIDE_DESCRIPTION_CIRCUS }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/gentle/CrookedHouse.h b/src/openrct2/ride/rtd/gentle/CrookedHouse.h index e6b840ef02..a160cc0437 100644 --- a/src/openrct2/ride/rtd/gentle/CrookedHouse.h +++ b/src/openrct2/ride/rtd/gentle/CrookedHouse.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor CrookedHouseRTD = RtdFlag::isFlatRide, RtdFlag::describeAsInside, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::CrookedHouse), - .DefaultMode = RideMode::CrookedHouse, + .RideModes = EnumsToFlags(RideMode::crookedHouse), + .DefaultMode = RideMode::crookedHouse, .Naming = { STR_RIDE_NAME_CROOKED_HOUSE, STR_RIDE_DESCRIPTION_CROOKED_HOUSE }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/gentle/Dodgems.h b/src/openrct2/ride/rtd/gentle/Dodgems.h index ea1c518735..c8b4273dfd 100644 --- a/src/openrct2/ride/rtd/gentle/Dodgems.h +++ b/src/openrct2/ride/rtd/gentle/Dodgems.h @@ -31,8 +31,8 @@ constexpr RideTypeDescriptor DodgemsRTD = RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::hasMusicByDefault, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::Dodgems), - .DefaultMode = RideMode::Dodgems, + .RideModes = EnumsToFlags(RideMode::dodgems), + .DefaultMode = RideMode::dodgems, .OperatingSettings = { 20, 180 }, .Naming = { STR_RIDE_NAME_DODGEMS, STR_RIDE_DESCRIPTION_DODGEMS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/gentle/FerrisWheel.h b/src/openrct2/ride/rtd/gentle/FerrisWheel.h index 952a2cfa97..23bc697b79 100644 --- a/src/openrct2/ride/rtd/gentle/FerrisWheel.h +++ b/src/openrct2/ride/rtd/gentle/FerrisWheel.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor FerrisWheelRTD = RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::slightlyInterestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::ForwardRotation, RideMode::BackwardRotation), - .DefaultMode = RideMode::ForwardRotation, + .RideModes = EnumsToFlags(RideMode::forwardRotation, RideMode::backwardRotation), + .DefaultMode = RideMode::forwardRotation, .OperatingSettings = { 1, 3 }, .Naming = { STR_RIDE_NAME_FERRIS_WHEEL, STR_RIDE_DESCRIPTION_FERRIS_WHEEL }, .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h index 2ee2f040b5..0bf68e1117 100644 --- a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h +++ b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor FlyingSaucersRTD = RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::hasMusicByDefault, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::Dodgems), - .DefaultMode = RideMode::Dodgems, + .RideModes = EnumsToFlags(RideMode::dodgems), + .DefaultMode = RideMode::dodgems, .OperatingSettings = { 20, 180 }, .Naming = { STR_RIDE_NAME_FLYING_SAUCERS, STR_RIDE_DESCRIPTION_FLYING_SAUCERS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/gentle/GhostTrain.h b/src/openrct2/ride/rtd/gentle/GhostTrain.h index 97cd2588e1..61b2a09986 100644 --- a/src/openrct2/ride/rtd/gentle/GhostTrain.h +++ b/src/openrct2/ride/rtd/gentle/GhostTrain.h @@ -34,8 +34,8 @@ constexpr RideTypeDescriptor GhostTrainRTD = RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::hasAirTime, RtdFlag::showInTrackDesigner, RtdFlag::interestingToLookAt, RtdFlag::hasLandscapeDoors), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_GHOST_TRAIN, STR_RIDE_DESCRIPTION_GHOST_TRAIN }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/gentle/HauntedHouse.h b/src/openrct2/ride/rtd/gentle/HauntedHouse.h index d7b361c160..4162b60d8c 100644 --- a/src/openrct2/ride/rtd/gentle/HauntedHouse.h +++ b/src/openrct2/ride/rtd/gentle/HauntedHouse.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor HauntedHouseRTD = RtdFlag::isFlatRide, RtdFlag::describeAsInside, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::HauntedHouse), - .DefaultMode = RideMode::HauntedHouse, + .RideModes = EnumsToFlags(RideMode::hauntedHouse), + .DefaultMode = RideMode::hauntedHouse, .Naming = { STR_RIDE_NAME_HAUNTED_HOUSE, STR_RIDE_DESCRIPTION_HAUNTED_HOUSE }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/gentle/Maze.h b/src/openrct2/ride/rtd/gentle/Maze.h index 032db531c6..3b1de76dc0 100644 --- a/src/openrct2/ride/rtd/gentle/Maze.h +++ b/src/openrct2/ride/rtd/gentle/Maze.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor MazeRTD = .Flags = EnumsToFlags(RtdFlag::hasTrackColourSupports, RtdFlag::hasSinglePieceStation, RtdFlag::noTestMode, RtdFlag::noVehicles, RtdFlag::noWallsAroundTrack, RtdFlag::describeAsInside, RtdFlag::hasTrack, RtdFlag::hasEntranceAndExit, RtdFlag::guestsCanUseUmbrella), - .RideModes = EnumsToFlags(RideMode::Maze), - .DefaultMode = RideMode::Maze, + .RideModes = EnumsToFlags(RideMode::maze), + .DefaultMode = RideMode::maze, .OperatingSettings = { 1, 64 }, .Naming = { STR_RIDE_NAME_MAZE, STR_RIDE_DESCRIPTION_MAZE }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/gentle/MerryGoRound.h b/src/openrct2/ride/rtd/gentle/MerryGoRound.h index 3ba213c60b..5a4b5a5724 100644 --- a/src/openrct2/ride/rtd/gentle/MerryGoRound.h +++ b/src/openrct2/ride/rtd/gentle/MerryGoRound.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor MerryGoRoundRTD = RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::hasMusicByDefault, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Rotation), - .DefaultMode = RideMode::Rotation, + .RideModes = EnumsToFlags(RideMode::rotation), + .DefaultMode = RideMode::rotation, .OperatingSettings = { 4, 25 }, .Naming = { STR_RIDE_NAME_MERRY_GO_ROUND, STR_RIDE_DESCRIPTION_MERRY_GO_ROUND }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/gentle/MiniGolf.h b/src/openrct2/ride/rtd/gentle/MiniGolf.h index 13f11fd616..d0648cd557 100644 --- a/src/openrct2/ride/rtd/gentle/MiniGolf.h +++ b/src/openrct2/ride/rtd/gentle/MiniGolf.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor MiniGolfRTD = .Flags = kRtdFlagsHasThreeColours | EnumsToFlags(RtdFlag::noTestMode, RtdFlag::hasTrack, RtdFlag::hasOneStation, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MINI_GOLF, STR_RIDE_DESCRIPTION_MINI_GOLF }, .NameConvention = { RideComponentType::Player, RideComponentType::Course, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h index 7519ca61d5..d21eb5c28b 100644 --- a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h +++ b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD = RtdFlag::allowDoorsOnTrack, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MINI_HELICOPTERS, STR_RIDE_DESCRIPTION_MINI_HELICOPTERS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/gentle/MonorailCycles.h b/src/openrct2/ride/rtd/gentle/MonorailCycles.h index 78c73f62ac..4ff0be2c1d 100644 --- a/src/openrct2/ride/rtd/gentle/MonorailCycles.h +++ b/src/openrct2/ride/rtd/gentle/MonorailCycles.h @@ -32,8 +32,8 @@ constexpr RideTypeDescriptor MonorailCyclesRTD = RtdFlag::guestsWillRideAgain, RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MONORAIL_CYCLES, STR_RIDE_DESCRIPTION_MONORAIL_CYCLES }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h index 4dc5334ffc..8373c8a61f 100644 --- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h +++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor MonsterTrucksRTD = RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt), - .RideModes = (1uLL << static_cast(RideMode::ContinuousCircuit)), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = (1uLL << static_cast(RideMode::continuousCircuit)), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MONSTER_TRUCKS, STR_RIDE_DESCRIPTION_MONSTER_TRUCKS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/gentle/ObservationTower.h b/src/openrct2/ride/rtd/gentle/ObservationTower.h index 4c9bf37825..ff52191d17 100644 --- a/src/openrct2/ride/rtd/gentle/ObservationTower.h +++ b/src/openrct2/ride/rtd/gentle/ObservationTower.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor ObservationTowerRTD = RtdFlag::hasLoadOptions, RtdFlag::noWallsAroundTrack, RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::RotatingLift), - .DefaultMode = RideMode::RotatingLift, + .RideModes = EnumsToFlags(RideMode::rotatingLift), + .DefaultMode = RideMode::rotatingLift, .Naming = { STR_RIDE_NAME_OBSERVATION_TOWER, STR_RIDE_DESCRIPTION_OBSERVATION_TOWER }, .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/gentle/SpaceRings.h b/src/openrct2/ride/rtd/gentle/SpaceRings.h index 05cb39e13c..bb2e8437b9 100644 --- a/src/openrct2/ride/rtd/gentle/SpaceRings.h +++ b/src/openrct2/ride/rtd/gentle/SpaceRings.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor SpaceRingsRTD = RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::slightlyInterestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::SpaceRings), - .DefaultMode = RideMode::SpaceRings, + .RideModes = EnumsToFlags(RideMode::spaceRings), + .DefaultMode = RideMode::spaceRings, .Naming = { STR_RIDE_NAME_SPACE_RINGS, STR_RIDE_DESCRIPTION_SPACE_RINGS }, .NameConvention = { RideComponentType::Ring, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/gentle/SpiralSlide.h b/src/openrct2/ride/rtd/gentle/SpiralSlide.h index b344ffc5d9..dc32de2d71 100644 --- a/src/openrct2/ride/rtd/gentle/SpiralSlide.h +++ b/src/openrct2/ride/rtd/gentle/SpiralSlide.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor SpiralSlideRTD = RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::SingleRidePerAdmission, RideMode::UnlimitedRidesPerAdmission), - .DefaultMode = RideMode::SingleRidePerAdmission, + .RideModes = EnumsToFlags(RideMode::singleRidePerAdmission, RideMode::unlimitedRidesPerAdmission), + .DefaultMode = RideMode::singleRidePerAdmission, .OperatingSettings = { 1, 5 }, .Naming = { STR_RIDE_NAME_SPIRAL_SLIDE, STR_RIDE_DESCRIPTION_SPIRAL_SLIDE }, .NameConvention = { RideComponentType::Train, RideComponentType::Building, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/shops/CashMachine.h b/src/openrct2/ride/rtd/shops/CashMachine.h index b4571b3097..e2c0490e01 100644 --- a/src/openrct2/ride/rtd/shops/CashMachine.h +++ b/src/openrct2/ride/rtd/shops/CashMachine.h @@ -27,8 +27,8 @@ constexpr RideTypeDescriptor CashMachineRTD = .Flags = EnumsToFlags(RtdFlag::hasSinglePieceStation, RtdFlag::cannotHaveGaps, RtdFlag::noTestMode, RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .Naming = { STR_RIDE_NAME_CASH_MACHINE, STR_RIDE_DESCRIPTION_CASH_MACHINE }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/shops/DrinkStall.h b/src/openrct2/ride/rtd/shops/DrinkStall.h index 0c69852535..a5a9ddc087 100644 --- a/src/openrct2/ride/rtd/shops/DrinkStall.h +++ b/src/openrct2/ride/rtd/shops/DrinkStall.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor DrinkStallRTD = RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::sellsDrinks, RtdFlag::listVehiclesSeparately, RtdFlag::hasTrackColourMain), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .Naming = { STR_RIDE_NAME_DRINK_STALL, STR_RIDE_DESCRIPTION_DRINK_STALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/shops/FirstAid.h b/src/openrct2/ride/rtd/shops/FirstAid.h index 06bced269d..cded5c062f 100644 --- a/src/openrct2/ride/rtd/shops/FirstAid.h +++ b/src/openrct2/ride/rtd/shops/FirstAid.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor FirstAidRTD = RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::guestsShouldGoInsideFacility, RtdFlag::describeAsInside, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .OperatingSettings = { 8, 8 }, .Naming = { STR_RIDE_NAME_FIRST_AID, STR_RIDE_DESCRIPTION_FIRST_AID }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/shops/FoodStall.h b/src/openrct2/ride/rtd/shops/FoodStall.h index 6bc9959626..c1077adb95 100644 --- a/src/openrct2/ride/rtd/shops/FoodStall.h +++ b/src/openrct2/ride/rtd/shops/FoodStall.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor FoodStallRTD = RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::sellsFood, RtdFlag::listVehiclesSeparately, RtdFlag::hasTrackColourMain), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .Naming = { STR_RIDE_NAME_FOOD_STALL, STR_RIDE_DESCRIPTION_FOOD_STALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/shops/InformationKiosk.h b/src/openrct2/ride/rtd/shops/InformationKiosk.h index 0f62606b0f..6394b13820 100644 --- a/src/openrct2/ride/rtd/shops/InformationKiosk.h +++ b/src/openrct2/ride/rtd/shops/InformationKiosk.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor InformationKioskRTD = RtdFlag::cannotHaveGaps, RtdFlag::noTestMode, RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .Naming = { STR_RIDE_NAME_INFORMATION_KIOSK, STR_RIDE_DESCRIPTION_INFORMATION_KIOSK }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/shops/Shop.h b/src/openrct2/ride/rtd/shops/Shop.h index a9f97c222e..e5c0cbb344 100644 --- a/src/openrct2/ride/rtd/shops/Shop.h +++ b/src/openrct2/ride/rtd/shops/Shop.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor ShopRTD = RtdFlag::cannotHaveGaps, RtdFlag::noTestMode, RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .Naming = { STR_RIDE_NAME_SHOP, STR_RIDE_DESCRIPTION_SHOP }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, .AvailableBreakdowns = 0, diff --git a/src/openrct2/ride/rtd/shops/Toilets.h b/src/openrct2/ride/rtd/shops/Toilets.h index 8a38399842..bfaa2a072e 100644 --- a/src/openrct2/ride/rtd/shops/Toilets.h +++ b/src/openrct2/ride/rtd/shops/Toilets.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor ToiletsRTD = RtdFlag::noVehicles, RtdFlag::isShopOrFacility, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::guestsShouldGoInsideFacility, RtdFlag::describeAsInside, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::ShopStall), - .DefaultMode = RideMode::ShopStall, + .RideModes = EnumsToFlags(RideMode::shopStall), + .DefaultMode = RideMode::shopStall, .OperatingSettings = { 4, 4 }, .Naming = { STR_RIDE_NAME_TOILETS, STR_RIDE_DESCRIPTION_TOILETS }, .NameConvention = { RideComponentType::Car, RideComponentType::Building, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/3DCinema.h b/src/openrct2/ride/rtd/thrill/3DCinema.h index 88b71e6d2e..8aa9082efe 100644 --- a/src/openrct2/ride/rtd/thrill/3DCinema.h +++ b/src/openrct2/ride/rtd/thrill/3DCinema.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor CinemaRTD = RtdFlag::isFlatRide, RtdFlag::describeAsInside, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::MouseTails3DFilm, RideMode::StormChasers3DFilm, RideMode::SpaceRaiders3DFilm), - .DefaultMode = RideMode::MouseTails3DFilm, + .RideModes = EnumsToFlags(RideMode::mouseTails3DFilm, RideMode::stormChasers3DFilm, RideMode::spaceRaiders3DFilm), + .DefaultMode = RideMode::mouseTails3DFilm, .Naming = { STR_RIDE_NAME_3D_CINEMA, STR_RIDE_DESCRIPTION_3D_CINEMA }, .NameConvention = { RideComponentType::Building, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/thrill/Enterprise.h b/src/openrct2/ride/rtd/thrill/Enterprise.h index 97db4b954a..bf7f0009a5 100644 --- a/src/openrct2/ride/rtd/thrill/Enterprise.h +++ b/src/openrct2/ride/rtd/thrill/Enterprise.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor EnterpriseRTD = RtdFlag::isFlatRide, RtdFlag::guestsWillRideAgain, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Rotation), - .DefaultMode = RideMode::Rotation, + .RideModes = EnumsToFlags(RideMode::rotation), + .DefaultMode = RideMode::rotation, .OperatingSettings = { 10, 20 }, .Naming = { STR_RIDE_NAME_ENTERPRISE, STR_RIDE_DESCRIPTION_ENTERPRISE }, .NameConvention = { RideComponentType::Wheel, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h index b8dbdea400..bbccd76e00 100644 --- a/src/openrct2/ride/rtd/thrill/GoKarts.h +++ b/src/openrct2/ride/rtd/thrill/GoKarts.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor GoKartsRTD = .Flags = EnumsToFlags(RtdFlag::hasTrackColourMain, RtdFlag::hasTrackColourSupports, RtdFlag::noTestMode, RtdFlag::hasOneStation, RtdFlag::noWallsAroundTrack, RtdFlag::guestsWillRideAgain, RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::Race, RideMode::ContinuousCircuit), - .DefaultMode = RideMode::Race, + .RideModes = EnumsToFlags(RideMode::race, RideMode::continuousCircuit), + .DefaultMode = RideMode::race, .OperatingSettings = { 1, 10 }, .Naming = { STR_RIDE_NAME_GO_KARTS, STR_RIDE_DESCRIPTION_GO_KARTS }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h index c8c0e4f838..05b4464ac1 100644 --- a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h +++ b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD = RtdFlag::hasDataLogging, RtdFlag::hasLoadOptions, RtdFlag::noWallsAroundTrack, RtdFlag::guestsWillRideAgain, RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::showInTrackDesigner, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::UpwardLaunch, RideMode::DownwardLaunch), - .DefaultMode = RideMode::UpwardLaunch, + .RideModes = EnumsToFlags(RideMode::upwardLaunch, RideMode::downwardLaunch), + .DefaultMode = RideMode::upwardLaunch, .OperatingSettings = { 10, 40 }, .Naming = { STR_RIDE_NAME_LAUNCHED_FREEFALL, STR_RIDE_DESCRIPTION_LAUNCHED_FREEFALL }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/MagicCarpet.h b/src/openrct2/ride/rtd/thrill/MagicCarpet.h index 9a740ab8f8..a14f380cc6 100644 --- a/src/openrct2/ride/rtd/thrill/MagicCarpet.h +++ b/src/openrct2/ride/rtd/thrill/MagicCarpet.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor MagicCarpetRTD = RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Swing), - .DefaultMode = RideMode::Swing, + .RideModes = EnumsToFlags(RideMode::swing), + .DefaultMode = RideMode::swing, .OperatingSettings = { 7, 15 }, .Naming = { STR_RIDE_NAME_MAGIC_CARPET, STR_RIDE_DESCRIPTION_MAGIC_CARPET }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/MotionSimulator.h b/src/openrct2/ride/rtd/thrill/MotionSimulator.h index 90d79069b8..6f856d1d16 100644 --- a/src/openrct2/ride/rtd/thrill/MotionSimulator.h +++ b/src/openrct2/ride/rtd/thrill/MotionSimulator.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor MotionSimulatorRTD = RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::slightlyInterestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::FilmAvengingAviators, RideMode::FilmThrillRiders), - .DefaultMode = RideMode::FilmAvengingAviators, + .RideModes = EnumsToFlags(RideMode::filmAvengingAviators, RideMode::filmThrillRiders), + .DefaultMode = RideMode::filmAvengingAviators, .Naming = { STR_RIDE_NAME_MOTION_SIMULATOR, STR_RIDE_DESCRIPTION_MOTION_SIMULATOR }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/thrill/RotoDrop.h b/src/openrct2/ride/rtd/thrill/RotoDrop.h index 3252a5a29a..3120b187aa 100644 --- a/src/openrct2/ride/rtd/thrill/RotoDrop.h +++ b/src/openrct2/ride/rtd/thrill/RotoDrop.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor RotoDropRTD = RtdFlag::guestsWillRideAgain, RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::showInTrackDesigner, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::FreefallDrop), - .DefaultMode = RideMode::FreefallDrop, + .RideModes = EnumsToFlags(RideMode::freefallDrop), + .DefaultMode = RideMode::freefallDrop, .Naming = { STR_RIDE_NAME_ROTO_DROP, STR_RIDE_DESCRIPTION_ROTO_DROP }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h index ee719c1e75..b067eb3dbc 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD = RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Swing), - .DefaultMode = RideMode::Swing, + .RideModes = EnumsToFlags(RideMode::swing), + .DefaultMode = RideMode::swing, .OperatingSettings = { 7, 15 }, .Naming = { STR_RIDE_NAME_SWINGING_INVERTER_SHIP, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP }, .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/SwingingShip.h b/src/openrct2/ride/rtd/thrill/SwingingShip.h index 90d169ab1f..5185dfdffa 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingShip.h @@ -31,8 +31,8 @@ constexpr RideTypeDescriptor SwingingShipRTD = RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Swing), - .DefaultMode = RideMode::Swing, + .RideModes = EnumsToFlags(RideMode::swing), + .DefaultMode = RideMode::swing, .OperatingSettings = { 7, 25 }, .Naming = { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP }, .NameConvention = { RideComponentType::Ship, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/thrill/TopSpin.h b/src/openrct2/ride/rtd/thrill/TopSpin.h index 0e9e9a77b5..d2cd7789fc 100644 --- a/src/openrct2/ride/rtd/thrill/TopSpin.h +++ b/src/openrct2/ride/rtd/thrill/TopSpin.h @@ -30,8 +30,8 @@ constexpr RideTypeDescriptor TopSpinRTD = RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Beginners, RideMode::Intense, RideMode::Berserk), - .DefaultMode = RideMode::Beginners, + .RideModes = EnumsToFlags(RideMode::beginners, RideMode::intense, RideMode::berserk), + .DefaultMode = RideMode::beginners, .Naming = { STR_RIDE_NAME_TOP_SPIN, STR_RIDE_DESCRIPTION_TOP_SPIN }, .NameConvention = { RideComponentType::Car, RideComponentType::Structure, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/thrill/Twist.h b/src/openrct2/ride/rtd/thrill/Twist.h index 020c5c699f..1a6432e500 100644 --- a/src/openrct2/ride/rtd/thrill/Twist.h +++ b/src/openrct2/ride/rtd/thrill/Twist.h @@ -28,8 +28,8 @@ constexpr RideTypeDescriptor TwistRTD = RtdFlag::vehicleIsIntegral, RtdFlag::noWallsAroundTrack, RtdFlag::isFlatRide, RtdFlag::hasVehicleColours, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::singleSession, RtdFlag::interestingToLookAt, RtdFlag::listVehiclesSeparately), - .RideModes = EnumsToFlags(RideMode::Rotation), - .DefaultMode = RideMode::Rotation, + .RideModes = EnumsToFlags(RideMode::rotation), + .DefaultMode = RideMode::rotation, .OperatingSettings = { 3, 6, 3 }, .Naming = { STR_RIDE_NAME_TWIST, STR_RIDE_DESCRIPTION_TWIST }, .NameConvention = { RideComponentType::Structure, RideComponentType::Structure, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/transport/Chairlift.h b/src/openrct2/ride/rtd/transport/Chairlift.h index 8e8c97fc8e..e33d73bdea 100644 --- a/src/openrct2/ride/rtd/transport/Chairlift.h +++ b/src/openrct2/ride/rtd/transport/Chairlift.h @@ -32,8 +32,8 @@ constexpr RideTypeDescriptor ChairliftRTD = RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::isTransportRide, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt, RtdFlag::isSuspended), - .RideModes = EnumsToFlags(RideMode::StationToStation), - .DefaultMode = RideMode::StationToStation, + .RideModes = EnumsToFlags(RideMode::stationToStation), + .DefaultMode = RideMode::stationToStation, .OperatingSettings = { 1, 4 }, .Naming = { STR_RIDE_NAME_CHAIRLIFT, STR_RIDE_DESCRIPTION_CHAIRLIFT }, .NameConvention = { RideComponentType::Car, RideComponentType::Track, RideComponentType::Station }, diff --git a/src/openrct2/ride/rtd/transport/Lift.h b/src/openrct2/ride/rtd/transport/Lift.h index 30e5dd8357..e4b88b58d6 100644 --- a/src/openrct2/ride/rtd/transport/Lift.h +++ b/src/openrct2/ride/rtd/transport/Lift.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor LiftRTD = RtdFlag::cannotHaveGaps, RtdFlag::hasLoadOptions, RtdFlag::noWallsAroundTrack, RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::allowExtraTowerBases, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::isTransportRide, RtdFlag::showInTrackDesigner), - .RideModes = EnumsToFlags(RideMode::Shuttle), - .DefaultMode = RideMode::Shuttle, + .RideModes = EnumsToFlags(RideMode::shuttle), + .DefaultMode = RideMode::shuttle, .Naming = { STR_RIDE_NAME_LIFT, STR_RIDE_DESCRIPTION_LIFT }, .NameConvention = { RideComponentType::Cabin, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h index 820bf50f58..18fccd456d 100644 --- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h +++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::allowMultipleCircuits, RtdFlag::isTransportRide, RtdFlag::showInTrackDesigner, RtdFlag::supportsLevelCrossings), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::shuttle), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/transport/Monorail.h b/src/openrct2/ride/rtd/transport/Monorail.h index aeb91d45e2..e16bd93357 100644 --- a/src/openrct2/ride/rtd/transport/Monorail.h +++ b/src/openrct2/ride/rtd/transport/Monorail.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor MonorailRTD = RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::allowMultipleCircuits, RtdFlag::isTransportRide, RtdFlag::showInTrackDesigner), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::shuttle), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h index 7e0adae84c..1c8e21e777 100644 --- a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h +++ b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD = RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::allowMultipleCircuits, RtdFlag::isTransportRide, RtdFlag::showInTrackDesigner, RtdFlag::isSuspended), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit, RideMode::Shuttle), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit, RideMode::shuttle), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SUSPENDED_MONORAIL, STR_RIDE_DESCRIPTION_SUSPENDED_MONORAIL }, .NameConvention = { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/water/BoatHire.h b/src/openrct2/ride/rtd/water/BoatHire.h index c2c86306a7..2780432611 100644 --- a/src/openrct2/ride/rtd/water/BoatHire.h +++ b/src/openrct2/ride/rtd/water/BoatHire.h @@ -29,8 +29,8 @@ constexpr RideTypeDescriptor BoatHireRTD = .Flags = EnumsToFlags(RtdFlag::hasTrackColourMain, RtdFlag::hasTrackColourSupports, RtdFlag::trackMustBeOnWater, RtdFlag::noTestMode, RtdFlag::hasLoadOptions, RtdFlag::hasVehicleColours, RtdFlag::checkForStalling, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit), - .RideModes = EnumsToFlags(RideMode::BoatHire), - .DefaultMode = RideMode::BoatHire, + .RideModes = EnumsToFlags(RideMode::boatHire), + .DefaultMode = RideMode::boatHire, .Naming = { STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE }, .NameConvention = { RideComponentType::Boat, RideComponentType::DockingPlatform, RideComponentType::DockingPlatform }, .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), diff --git a/src/openrct2/ride/rtd/water/DinghySlide.h b/src/openrct2/ride/rtd/water/DinghySlide.h index e08ffbfbf3..71bfaec8e5 100644 --- a/src/openrct2/ride/rtd/water/DinghySlide.h +++ b/src/openrct2/ride/rtd/water/DinghySlide.h @@ -46,8 +46,8 @@ constexpr RideTypeDescriptor DinghySlideRTD = RtdFlag::checkForStalling, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::hasAirTime, RtdFlag::showInTrackDesigner, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_DINGHY_SLIDE, STR_RIDE_DESCRIPTION_DINGHY_SLIDE }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h index e959984260..c53da6b556 100644 --- a/src/openrct2/ride/rtd/water/LogFlume.h +++ b/src/openrct2/ride/rtd/water/LogFlume.h @@ -32,8 +32,8 @@ constexpr RideTypeDescriptor LogFlumeRTD = RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::hasAirTime, RtdFlag::showInTrackDesigner, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_LOG_FLUME, STR_RIDE_DESCRIPTION_LOG_FLUME }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), diff --git a/src/openrct2/ride/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h index 83b272b7a4..d5313a89c1 100644 --- a/src/openrct2/ride/rtd/water/RiverRafts.h +++ b/src/openrct2/ride/rtd/water/RiverRafts.h @@ -32,8 +32,8 @@ constexpr RideTypeDescriptor RiverRaftsRTD = RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_RIVER_RAFTS, STR_RIDE_DESCRIPTION_RIVER_RAFTS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h index d2ea984b0e..d762cb8432 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor RiverRapidsRTD = RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::hasAirTime, RtdFlag::showInTrackDesigner, RtdFlag::interestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_RIVER_RAPIDS, STR_RIDE_DESCRIPTION_RIVER_RAPIDS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), diff --git a/src/openrct2/ride/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h index e6fa2a771c..d2af8bc297 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -33,8 +33,8 @@ constexpr RideTypeDescriptor SplashBoatsRTD = RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits, RtdFlag::hasAirTime, RtdFlag::showInTrackDesigner, RtdFlag::slightlyInterestingToLookAt), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SPLASH_BOATS, STR_RIDE_DESCRIPTION_SPLASH_BOATS }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), diff --git a/src/openrct2/ride/rtd/water/SubmarineRide.h b/src/openrct2/ride/rtd/water/SubmarineRide.h index a3cbdb97b7..96577b4d58 100644 --- a/src/openrct2/ride/rtd/water/SubmarineRide.h +++ b/src/openrct2/ride/rtd/water/SubmarineRide.h @@ -32,8 +32,8 @@ constexpr RideTypeDescriptor SubmarineRideRTD = RtdFlag::hasVehicleColours, RtdFlag::hasTrack, RtdFlag::supportsMultipleColourSchemes, RtdFlag::allowMusic, RtdFlag::checkGForces, RtdFlag::hasEntranceAndExit, RtdFlag::allowMoreVehiclesThanStationFits), - .RideModes = EnumsToFlags(RideMode::ContinuousCircuit), - .DefaultMode = RideMode::ContinuousCircuit, + .RideModes = EnumsToFlags(RideMode::continuousCircuit), + .DefaultMode = RideMode::continuousCircuit, .Naming = { STR_RIDE_NAME_SUBMARINE_RIDE, STR_RIDE_DESCRIPTION_SUBMARINE_RIDE }, .NameConvention = { RideComponentType::Boat, RideComponentType::Track, RideComponentType::DockingPlatform }, .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION),