diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 5fa01dca23..3edebe5a22 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -300,7 +300,7 @@ namespace OpenRCT2::Ui return info; } ride = GetRide(vehicle->ride); - if (ride != nullptr && ride->status == RideStatus::Closed) + if (ride != nullptr && ride->status == RideStatus::closed) { auto ft = Formatter(); ft.Add(STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY); @@ -329,7 +329,7 @@ namespace OpenRCT2::Ui return info; } - if (ride->status != RideStatus::Closed) + if (ride->status != RideStatus::closed) return info; auto ft = Formatter(); diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index efc76d9b5d..3882549d05 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -215,7 +215,7 @@ namespace OpenRCT2::Ui::Windows void OnUpdate() override { auto currentRide = GetRide(_currentRideIndex); - if (currentRide == nullptr || currentRide->status != RideStatus::Closed) + if (currentRide == nullptr || currentRide->status != RideStatus::closed) { Close(); return; diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 6b7d51b243..a3a9fc1e76 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -144,7 +144,7 @@ namespace OpenRCT2::Ui::Windows RideList.clear(); for (const auto& curRide : GetRideManager()) { - if (curRide.status == RideStatus::Open) + if (curRide.status == RideStatus::open) { const auto& rtd = curRide.GetRideTypeDescriptor(); if (rtd.HasFlag(RtdFlag::isShopOrFacility)) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 460819eebb..60385622f8 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1660,16 +1660,16 @@ namespace OpenRCT2::Ui::Windows { default: case WIDX_CLOSE_LIGHT: - status = RideStatus::Closed; + status = RideStatus::closed; break; case WIDX_SIMULATE_LIGHT: - status = RideStatus::Simulating; + status = RideStatus::simulating; break; case WIDX_TEST_LIGHT: - status = RideStatus::Testing; + status = RideStatus::testing; break; case WIDX_OPEN_LIGHT: - status = RideStatus::Open; + status = RideStatus::open; break; } auto gameAction = RideSetStatusAction(ride->id, status); @@ -1691,12 +1691,12 @@ namespace OpenRCT2::Ui::Windows if (ride != nullptr) { #ifdef __SIMULATE_IN_RIDE_WINDOW__ - if (ride->SupportsStatus(RideStatus::Simulating)) + if (ride->SupportsStatus(RideStatus::simulating)) { minHeight += 14; } #endif - if (ride->SupportsStatus(RideStatus::Testing)) + if (ride->SupportsStatus(RideStatus::testing)) { minHeight += 14; } @@ -1797,23 +1797,23 @@ namespace OpenRCT2::Ui::Windows switch (ride.status) { default: - case RideStatus::Closed: + case RideStatus::closed: if ((ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED) || (ride.lifecycle_flags & RIDE_LIFECYCLE_HAS_STALLED_VEHICLE)) { - return RideStatus::Closed; + return RideStatus::closed; } - if (ride.SupportsStatus(RideStatus::Testing) && !(ride.lifecycle_flags & RIDE_LIFECYCLE_TESTED)) + if (ride.SupportsStatus(RideStatus::testing) && !(ride.lifecycle_flags & RIDE_LIFECYCLE_TESTED)) { - return RideStatus::Testing; + return RideStatus::testing; } - return RideStatus::Open; - case RideStatus::Simulating: - return RideStatus::Testing; - case RideStatus::Testing: - return (ride.lifecycle_flags & RIDE_LIFECYCLE_TESTED) ? RideStatus::Open : RideStatus::Closed; - case RideStatus::Open: - return RideStatus::Closed; + return RideStatus::open; + case RideStatus::simulating: + return RideStatus::testing; + case RideStatus::testing: + return (ride.lifecycle_flags & RIDE_LIFECYCLE_TESTED) ? RideStatus::open : RideStatus::closed; + case RideStatus::open: + return RideStatus::closed; } } @@ -1856,12 +1856,12 @@ namespace OpenRCT2::Ui::Windows info.CurrentStatus = info.Ride->status; info.DefaultStatus = GetNextDefaultStatus(*info.Ride); - SetDropdown(info, RideStatus::Closed, STR_CLOSE_RIDE); + SetDropdown(info, RideStatus::closed, STR_CLOSE_RIDE); #ifdef __SIMULATE_IN_RIDE_WINDOW__ - SetDropdown(info, RideStatus::Simulating, STR_SIMULATE_RIDE); + SetDropdown(info, RideStatus::simulating, STR_SIMULATE_RIDE); #endif - SetDropdown(info, RideStatus::Testing, STR_TEST_RIDE); - SetDropdown(info, RideStatus::Open, STR_OPEN_RIDE); + SetDropdown(info, RideStatus::testing, STR_TEST_RIDE); + SetDropdown(info, RideStatus::open, STR_OPEN_RIDE); WindowDropdownShowText( { windowPos.x + widget->left, windowPos.y + widget->top }, widget->height() + 1, colours[1], 0, info.NumItems); Dropdown::SetChecked(info.CheckedIndex, true); @@ -2198,7 +2198,7 @@ namespace OpenRCT2::Ui::Windows auto ride = GetRide(rideId); if (ride != nullptr) { - auto status = RideStatus::Closed; + auto status = RideStatus::closed; if (dropdownIndex < 0) { dropdownIndex = gDropdownHighlightedIndex; @@ -2208,16 +2208,16 @@ namespace OpenRCT2::Ui::Windows switch (gDropdownItems[dropdownIndex].Args) { case STR_CLOSE_RIDE: - status = RideStatus::Closed; + status = RideStatus::closed; break; case STR_SIMULATE_RIDE: - status = RideStatus::Simulating; + status = RideStatus::simulating; break; case STR_TEST_RIDE: - status = RideStatus::Testing; + status = RideStatus::testing; break; case STR_OPEN_RIDE: - status = RideStatus::Open; + status = RideStatus::open; break; } } @@ -2341,25 +2341,25 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_OPEN].image = ImageId(spriteIds[EnumValue(ride->status)]); #ifdef __SIMULATE_IN_RIDE_WINDOW__ - widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RideStatus::Closed) * 2 + widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RideStatus::closed) * 2 + WidgetIsPressed(*this, WIDX_CLOSE_LIGHT); - widgets[WIDX_SIMULATE_LIGHT].image = SPR_G2_RCT1_SIMULATE_BUTTON_0 + (ride->status == RideStatus::Simulating) * 2 + widgets[WIDX_SIMULATE_LIGHT].image = SPR_G2_RCT1_SIMULATE_BUTTON_0 + (ride->status == RideStatus::simulating) * 2 + WidgetIsPressed(*w, WIDX_SIMULATE_LIGHT); - widgets[WIDX_TEST_LIGHT].image = SPR_G2_RCT1_TEST_BUTTON_0 + (ride->status == RideStatus::Testing) * 2 + widgets[WIDX_TEST_LIGHT].image = SPR_G2_RCT1_TEST_BUTTON_0 + (ride->status == RideStatus::testing) * 2 + WidgetIsPressed(*this, WIDX_TEST_LIGHT); #else - const auto closeLightImage = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RideStatus::Closed) * 2 + const auto closeLightImage = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RideStatus::closed) * 2 + WidgetIsPressed(*this, WIDX_CLOSE_LIGHT); widgets[WIDX_CLOSE_LIGHT].image = ImageId(closeLightImage); - auto baseSprite = ride->status == RideStatus::Simulating ? SPR_G2_RCT1_SIMULATE_BUTTON_0 + auto baseSprite = ride->status == RideStatus::simulating ? SPR_G2_RCT1_SIMULATE_BUTTON_0 : SPR_G2_RCT1_TEST_BUTTON_0; const auto testLightImage = baseSprite - + (ride->status == RideStatus::Testing || ride->status == RideStatus::Simulating) * 2 + + (ride->status == RideStatus::testing || ride->status == RideStatus::simulating) * 2 + WidgetIsPressed(*this, WIDX_TEST_LIGHT); widgets[WIDX_TEST_LIGHT].image = ImageId(testLightImage); #endif - const auto openLightImage = SPR_G2_RCT1_OPEN_BUTTON_0 + (ride->status == RideStatus::Open) * 2 + const auto openLightImage = SPR_G2_RCT1_OPEN_BUTTON_0 + (ride->status == RideStatus::open) * 2 + WidgetIsPressed(*this, WIDX_OPEN_LIGHT); widgets[WIDX_OPEN_LIGHT].image = ImageId(openLightImage); @@ -2403,10 +2403,10 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::ImgBtn; widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::Empty; #ifdef __SIMULATE_IN_RIDE_WINDOW__ - if (ride->SupportsStatus(RideStatus::Simulating)) + if (ride->SupportsStatus(RideStatus::simulating)) widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::ImgBtn; #endif - widgets[WIDX_TEST_LIGHT].type = ride->SupportsStatus(RideStatus::Testing) ? WindowWidgetType::ImgBtn + widgets[WIDX_TEST_LIGHT].type = ride->SupportsStatus(RideStatus::testing) ? WindowWidgetType::ImgBtn : WindowWidgetType::Empty; widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::ImgBtn; @@ -2531,7 +2531,7 @@ namespace OpenRCT2::Ui::Windows const auto& station = ride->GetStation(*stationIndex); StringId stringId = kStringIdEmpty; // Entrance / exit - if (ride->status == RideStatus::Closed) + if (ride->status == RideStatus::closed) { if (station.Entrance.IsNull()) stringId = STR_NO_ENTRANCE; @@ -3941,7 +3941,7 @@ namespace OpenRCT2::Ui::Windows { ContextShowError(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_ALREADY_BROKEN, {}); } - else if (ride->status == RideStatus::Closed) + else if (ride->status == RideStatus::closed) { ContextShowError(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_IS_CLOSED, {}); } diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 347abc5a9f..3724b15539 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -312,7 +312,7 @@ namespace OpenRCT2::Ui::Windows if (!_autoOpeningShop) { _autoOpeningShop = true; - auto gameAction = RideSetStatusAction(currentRide->id, RideStatus::Open); + auto gameAction = RideSetStatusAction(currentRide->id, RideStatus::open); GameActions::Execute(&gameAction); _autoOpeningShop = false; } @@ -962,7 +962,7 @@ namespace OpenRCT2::Ui::Windows // Close construction window if currentRide is not closed, // editing currentRide while open will cause many issues until properly handled - if (currentRide->status != RideStatus::Closed && currentRide->status != RideStatus::Simulating) + if (currentRide->status != RideStatus::closed && currentRide->status != RideStatus::simulating) { Close(); return; @@ -1040,8 +1040,8 @@ namespace OpenRCT2::Ui::Windows auto currentRide = GetRide(_currentRideIndex); if (currentRide != nullptr) { - auto status = currentRide->status == RideStatus::Simulating ? RideStatus::Closed - : RideStatus::Simulating; + auto status = currentRide->status == RideStatus::simulating ? RideStatus::closed + : RideStatus::simulating; auto gameAction = RideSetStatusAction(currentRide->id, status); GameActions::Execute(&gameAction); } @@ -1574,10 +1574,10 @@ namespace OpenRCT2::Ui::Windows // Simulate button auto& simulateWidget = widgets[WIDX_SIMULATE]; simulateWidget.type = WindowWidgetType::Empty; - if (currentRide->SupportsStatus(RideStatus::Simulating)) + if (currentRide->SupportsStatus(RideStatus::simulating)) { simulateWidget.type = WindowWidgetType::FlatBtn; - if (currentRide->status == RideStatus::Simulating) + if (currentRide->status == RideStatus::simulating) { pressed_widgets |= (1uLL << WIDX_SIMULATE); } diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 94e56434b7..7b624d0d86 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -491,10 +491,10 @@ namespace OpenRCT2::Ui::Windows { auto c = static_cast(page); allClosed = std::none_of(rideManager.begin(), rideManager.end(), [c](const Ride& rideRef) { - return rideRef.GetClassification() == c && rideRef.status == RideStatus::Open; + return rideRef.GetClassification() == c && rideRef.status == RideStatus::open; }); allOpen = std::none_of(rideManager.begin(), rideManager.end(), [c](const Ride& rideRef) { - return rideRef.GetClassification() == c && rideRef.status != RideStatus::Open; + return rideRef.GetClassification() == c && rideRef.status != RideStatus::open; }); } @@ -823,7 +823,7 @@ namespace OpenRCT2::Ui::Windows for (auto& rideRef : GetRideManager()) { if (rideRef.GetClassification() != static_cast(page) - || (rideRef.status == RideStatus::Closed && !RideHasAnyTrackElements(rideRef))) + || (rideRef.status == RideStatus::closed && !RideHasAnyTrackElements(rideRef))) { continue; } @@ -948,10 +948,10 @@ namespace OpenRCT2::Ui::Windows { for (auto& rideRef : GetRideManager()) { - if (rideRef.status != RideStatus::Closed + if (rideRef.status != RideStatus::closed && rideRef.GetClassification() == static_cast(page)) { - auto gameAction = RideSetStatusAction(rideRef.id, RideStatus::Closed); + auto gameAction = RideSetStatusAction(rideRef.id, RideStatus::closed); GameActions::Execute(&gameAction); } } @@ -962,9 +962,9 @@ namespace OpenRCT2::Ui::Windows { for (auto& rideRef : GetRideManager()) { - if (rideRef.status != RideStatus::Open && rideRef.GetClassification() == static_cast(page)) + if (rideRef.status != RideStatus::open && rideRef.GetClassification() == static_cast(page)) { - auto gameAction = RideSetStatusAction(rideRef.id, RideStatus::Open); + auto gameAction = RideSetStatusAction(rideRef.id, RideStatus::open); GameActions::Execute(&gameAction); } } diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 62dc1caf47..c232c63734 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -155,7 +155,7 @@ GameActions::Result RideCreateAction::Execute() const station.Exit.SetNull(); std::ranges::fill(ride->GetStations(), station); - ride->status = RideStatus::Closed; + ride->status = RideStatus::closed; ride->NumTrains = 1; auto& gameState = GetGameState(); diff --git a/src/openrct2/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp index 14c6debf58..616205a873 100644 --- a/src/openrct2/actions/RideDemolishAction.cpp +++ b/src/openrct2/actions/RideDemolishAction.cpp @@ -76,7 +76,7 @@ GameActions::Result RideDemolishAction::Query() const if (_modifyType == RIDE_MODIFY_RENEW) { - if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating) + if (ride->status != RideStatus::closed && ride->status != RideStatus::simulating) { return GameActions::Result(GameActions::Status::Disallowed, STR_CANT_REFURBISH_RIDE, STR_MUST_BE_CLOSED_FIRST); } diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index 249f8ac026..e006d5083b 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -71,7 +71,7 @@ GameActions::Result RideEntranceExitPlaceAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, errorTitle, STR_ERR_VALUE_OUT_OF_RANGE); } - if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating) + if (ride->status != RideStatus::closed && ride->status != RideStatus::simulating) { return GameActions::Result(GameActions::Status::NotClosed, errorTitle, STR_MUST_BE_CLOSED_FIRST); } diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp index 79367b7f03..578ba262e2 100644 --- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp @@ -75,7 +75,7 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_RIDE_NOT_FOUND); } - if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating) + if (ride->status != RideStatus::closed && ride->status != RideStatus::simulating) { return GameActions::Result(GameActions::Status::InvalidParameters, STR_MUST_BE_CLOSED_FIRST, kStringIdNone); } diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index 732a6212ec..6204c6b982 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -64,7 +64,7 @@ GameActions::Result RideSetSettingAction::Query() const GameActions::Status::Disallowed, STR_CANT_CHANGE_OPERATING_MODE, STR_HAS_BROKEN_DOWN_AND_REQUIRES_FIXING); } - if (ride->status != RideStatus::Closed && ride->status != RideStatus::Simulating) + if (ride->status != RideStatus::closed && ride->status != RideStatus::simulating) { return GameActions::Result( GameActions::Status::Disallowed, STR_CANT_CHANGE_OPERATING_MODE, STR_MUST_BE_CLOSED_FIRST); diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index 15d3f5520e..715a1c38b3 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -66,7 +66,7 @@ GameActions::Result RideSetStatusAction::Query() const return res; } - if (_status >= RideStatus::Count) + if (_status >= RideStatus::count) { LOG_ERROR("Invalid ride status %u for ride %u", EnumValue(_status), _rideIndex.ToUnderlying()); res.Error = GameActions::Status::InvalidParameters; @@ -81,7 +81,7 @@ GameActions::Result RideSetStatusAction::Query() const ride->FormatNameTo(ft); if (_status != ride->status) { - if (_status == RideStatus::Simulating && (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) + if (_status == RideStatus::simulating && (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { // Simulating will force clear the track, so make sure player can't cheat around a break down res.Error = GameActions::Status::Disallowed; @@ -92,13 +92,13 @@ GameActions::Result RideSetStatusAction::Query() const ResultWithMessage modeSwitchResult = { true }; switch (_status) { - case RideStatus::Open: + case RideStatus::open: modeSwitchResult = ride->Open(false); break; - case RideStatus::Testing: + case RideStatus::testing: modeSwitchResult = ride->Test(false); break; - case RideStatus::Simulating: + case RideStatus::simulating: modeSwitchResult = ride->Simulate(false); break; default: @@ -145,8 +145,8 @@ GameActions::Result RideSetStatusAction::Execute() const switch (_status) { - case RideStatus::Closed: - if (ride->status == _status || ride->status == RideStatus::Simulating) + case RideStatus::closed: + if (ride->status == _status || ride->status == RideStatus::simulating) { if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { @@ -156,13 +156,13 @@ GameActions::Result RideSetStatusAction::Execute() const } } - ride->status = RideStatus::Closed; + ride->status = RideStatus::closed; ride->lifecycle_flags &= ~RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING; ride->race_winner = EntityId::GetNull(); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST; windowMgr->InvalidateByNumber(WindowClass::Ride, _rideIndex.ToUnderlying()); break; - case RideStatus::Simulating: + case RideStatus::simulating: { ride->lifecycle_flags &= ~RIDE_LIFECYCLE_CRASHED; RideClearForConstruction(*ride); @@ -186,15 +186,15 @@ GameActions::Result RideSetStatusAction::Execute() const windowMgr->InvalidateByNumber(WindowClass::Ride, _rideIndex.ToUnderlying()); break; } - case RideStatus::Testing: - case RideStatus::Open: + case RideStatus::testing: + case RideStatus::open: { if (ride->status == _status) { return res; } - if (ride->status == RideStatus::Simulating) + if (ride->status == RideStatus::simulating) { RideClearForConstruction(*ride); ride->RemovePeeps(); @@ -208,7 +208,7 @@ GameActions::Result RideSetStatusAction::Execute() const windowMgr->Close(*constructionWindow); } - if (_status == RideStatus::Testing) + if (_status == RideStatus::testing) { const auto modeSwitchResult = ride->Test(true); if (!modeSwitchResult.Successful) diff --git a/src/openrct2/actions/RideSetStatusAction.h b/src/openrct2/actions/RideSetStatusAction.h index 96f937ac46..0f602919a0 100644 --- a/src/openrct2/actions/RideSetStatusAction.h +++ b/src/openrct2/actions/RideSetStatusAction.h @@ -15,7 +15,7 @@ class RideSetStatusAction final : public GameActionBasestatus != RideStatus::Closed && ride->status != RideStatus::Simulating) + if (ride->status != RideStatus::closed && ride->status != RideStatus::simulating) { return GameActions::Result(GameActions::Status::NotClosed, errTitle, STR_MUST_BE_CLOSED_FIRST); } diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index bf73321437..cda3256550 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1955,7 +1955,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // Indicates whether a peep is physically at the ride, or is just thinking about going on the ride. bool peepAtRide = !thinking; - if (ride.status == RideStatus::Open && !(ride.lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) + if (ride.status == RideStatus::open && !(ride.lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { // Peeps that are leaving the park will refuse to go on any rides, with the exception of free transport rides. assert(ride.type < std::size(kRideTypeDescriptors)); @@ -3001,7 +3001,7 @@ static PeepThoughtType PeepAssessSurroundings(int16_t centre_x, int16_t centre_y if (ride == nullptr) break; - bool isPlayingMusic = ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC && ride->status != RideStatus::Closed + bool isPlayingMusic = ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC && ride->status != RideStatus::closed && !(ride->lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED)); if (!isPlayingMusic) break; @@ -3367,7 +3367,7 @@ void Guest::UpdateBuying() return; auto ride = GetRide(CurrentRide); - if (ride == nullptr || ride->status != RideStatus::Open) + if (ride == nullptr || ride->status != RideStatus::open) { SetState(PeepState::Falling); return; @@ -3521,7 +3521,7 @@ void Guest::UpdateRideAtEntrance() return; } - if (ride->status != RideStatus::Open || ride->vehicle_change_timeout != 0) + if (ride->status != RideStatus::open || ride->vehicle_change_timeout != 0) { PeepUpdateRideAtEntranceTryLeave(this); return; @@ -3975,7 +3975,7 @@ void Guest::UpdateRideFreeVehicleCheck() if (ride->GetRideTypeDescriptor().HasFlag(RtdFlag::noVehicles)) { - if (ride->status != RideStatus::Open || ride->vehicle_change_timeout != 0 || (++RejoinQueueTimeout) == 0) + if (ride->status != RideStatus::open || ride->vehicle_change_timeout != 0 || (++RejoinQueueTimeout) == 0) { PeepUpdateRideNoFreeVehicleRejoinQueue(this, *ride); return; @@ -4054,7 +4054,7 @@ void Guest::UpdateRideFreeVehicleCheck() { return; } - if (ride->status == RideStatus::Open && ++RejoinQueueTimeout != 0 && !currentTrain->HasFlag(VehicleFlags::ReadyToDepart)) + if (ride->status == RideStatus::open && ++RejoinQueueTimeout != 0 && !currentTrain->HasFlag(VehicleFlags::ReadyToDepart)) { return; } @@ -4695,7 +4695,7 @@ void Guest::UpdateRideApproachSpiralSlide() if (waypoint == 2) { bool lastRide = false; - if (ride->status != RideStatus::Open) + if (ride->status != RideStatus::open) lastRide = true; else if (CurrentCar++ != 0) { @@ -5620,7 +5620,7 @@ void Guest::UpdateQueuing() return; } auto ride = GetRide(CurrentRide); - if (ride == nullptr || ride->status != RideStatus::Open) + if (ride == nullptr || ride->status != RideStatus::open) { RemoveFromQueue(); SetState(PeepState::One); @@ -6364,7 +6364,7 @@ bool Loc690FD0(Peep* peep, RideId* rideToView, uint8_t* rideSeatToView, TileElem if (ride->ratings.isNull()) { *rideSeatToView = 1; - if (ride->status != RideStatus::Open) + if (ride->status != RideStatus::open) { if (tileElement->GetClearanceZ() > peep->NextLoc.z + (8 * kCoordsZStep)) { @@ -6377,7 +6377,7 @@ bool Loc690FD0(Peep* peep, RideId* rideToView, uint8_t* rideSeatToView, TileElem else { *rideSeatToView = 0; - if (ride->status == RideStatus::Open && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) + if (ride->status == RideStatus::open && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { if (tileElement->GetClearanceZ() > peep->NextLoc.z + (8 * kCoordsZStep)) { diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 688101df9c..e6678d477e 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -2371,7 +2371,7 @@ static bool PeepInteractWithShop(Peep* peep, const CoordsXYE& coords) guest->TimeLost = 0; - if (ride->status != RideStatus::Open) + if (ride->status != RideStatus::open) { PeepReturnToCentreOfTile(guest); return true; diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index dcb30bd0cc..a599f8278e 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -148,7 +148,7 @@ static bool AwardIsDeservedBestRollercoasters([[maybe_unused]] int32_t activeAwa continue; } - if (ride.status != RideStatus::Open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) + if (ride.status != RideStatus::open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) { continue; } @@ -289,7 +289,7 @@ static bool AwardIsDeservedBestFood(int32_t activeAwardTypes) uint64_t shopTypes = 0; for (const auto& ride : GetRideManager()) { - if (ride.status != RideStatus::Open) + if (ride.status != RideStatus::open) continue; if (!ride.GetRideTypeDescriptor().HasFlag(RtdFlag::sellsFood)) continue; @@ -334,7 +334,7 @@ static bool AwardIsDeservedWorstFood(int32_t activeAwardTypes) uint64_t shopTypes = 0; for (const auto& ride : GetRideManager()) { - if (ride.status != RideStatus::Open) + if (ride.status != RideStatus::open) continue; if (!ride.GetRideTypeDescriptor().HasFlag(RtdFlag::sellsFood)) continue; @@ -375,7 +375,7 @@ static bool AwardIsDeservedBestToilets([[maybe_unused]] int32_t activeAwardTypes const auto& rideManager = GetRideManager(); auto numToilets = static_cast(std::count_if(rideManager.begin(), rideManager.end(), [](const Ride& ride) { const auto& rtd = ride.GetRideTypeDescriptor(); - return rtd.specialType == RtdSpecialType::toilet && ride.status == RideStatus::Open; + return rtd.specialType == RtdSpecialType::toilet && ride.status == RideStatus::open; })); // At least 4 open toilets @@ -439,7 +439,7 @@ static bool AwardIsDeservedBestWaterRides([[maybe_unused]] int32_t activeAwardTy continue; } - if (ride.status != RideStatus::Open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) + if (ride.status != RideStatus::open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) { continue; } @@ -470,7 +470,7 @@ static bool AwardIsDeservedBestCustomDesignedRides(int32_t activeAwardTypes) continue; if (ride.ratings.excitement < MakeRideRating(5, 50)) continue; - if (ride.status != RideStatus::Open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) + if (ride.status != RideStatus::open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) continue; customDesignedRides++; @@ -546,7 +546,7 @@ static bool AwardIsDeservedBestGentleRides([[maybe_unused]] int32_t activeAwardT continue; } - if (ride.status != RideStatus::Open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) + if (ride.status != RideStatus::open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) { continue; } diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index bab162a3d4..b1c510e019 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -165,7 +165,7 @@ void FinancePayRideUpkeep() ride.Renew(); } - if (ride.status != RideStatus::Closed && !(GetGameState().Park.Flags & PARK_FLAGS_NO_MONEY)) + if (ride.status != RideStatus::closed && !(GetGameState().Park.Flags & PARK_FLAGS_NO_MONEY)) { auto upkeep = ride.upkeep_cost; if (upkeep != kMoney64Undefined) @@ -271,7 +271,7 @@ void FinanceUpdateDailyProfit() // Ride costs for (auto& ride : GetRideManager()) { - if (ride.status != RideStatus::Closed && ride.upkeep_cost != kMoney64Undefined) + if (ride.status != RideStatus::closed && ride.upkeep_cost != kMoney64Undefined) { current_profit -= 2 * ride.upkeep_cost; } diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 97cff835e6..454b052370 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -57,7 +57,7 @@ static void PaintRideEntranceExitScrollingText( auto ft = Formatter(); ft.Add(STR_RIDE_ENTRANCE_NAME); - if (ride->status == RideStatus::Open && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) + if (ride->status == RideStatus::open && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { ride->FormatNameTo(ft); } diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index 7b5f19e840..d02a58de28 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -155,7 +155,7 @@ static void PathPaintQueueBanner( auto ft = Formatter(); - if (ride->status == RideStatus::Open && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) + if (ride->status == RideStatus::open && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { ft.Add(STR_RIDE_ENTRANCE_NAME); ride->FormatNameTo(ft); diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index bb380a334b..edba14eb18 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -2040,7 +2040,7 @@ namespace OpenRCT2::PathFinding // Peep is heading for a ride. RideId rideIndex = peep.GuestHeadingToRideId; auto ride = GetRide(rideIndex); - if (ride == nullptr || ride->status != RideStatus::Open) + if (ride == nullptr || ride->status != RideStatus::open) { LogPathfinding(&peep, "Completed CalculateNextDestination - peep is heading to closed ride == aimless."); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 0bd7a6149f..8b766886c2 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -813,7 +813,7 @@ void Ride::FormatStatusTo(Formatter& ft) const { ft.Add(STR_BROKEN_DOWN); } - else if (status == RideStatus::Closed) + else if (status == RideStatus::closed) { if (!GetRideTypeDescriptor().HasFlag(RtdFlag::isShopOrFacility)) { @@ -832,11 +832,11 @@ void Ride::FormatStatusTo(Formatter& ft) const ft.Add(STR_CLOSED); } } - else if (status == RideStatus::Simulating) + else if (status == RideStatus::simulating) { ft.Add(STR_SIMULATING); } - else if (status == RideStatus::Testing) + else if (status == RideStatus::testing) { ft.Add(STR_TEST_RUN); } @@ -906,14 +906,14 @@ bool Ride::SupportsStatus(RideStatus s) const switch (s) { - case RideStatus::Closed: - case RideStatus::Open: + case RideStatus::closed: + case RideStatus::open: return true; - case RideStatus::Simulating: + case RideStatus::simulating: return (!rtd.HasFlag(RtdFlag::noTestMode) && rtd.HasFlag(RtdFlag::hasTrack)); - case RideStatus::Testing: + case RideStatus::testing: return !rtd.HasFlag(RtdFlag::noTestMode); - case RideStatus::Count: // Meaningless but necessary to satisfy -Wswitch + case RideStatus::count: // Meaningless but necessary to satisfy -Wswitch return false; } // Unreachable @@ -1124,18 +1124,18 @@ void Ride::Update() RideInspectionUpdate(*this); // If ride is simulating but crashed, reset the vehicles - if (status == RideStatus::Simulating && (lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) + if (status == RideStatus::simulating && (lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) { 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); + RideSetStatusAction gameAction = RideSetStatusAction(id, RideStatus::closed); GameActions::ExecuteNested(&gameAction); } else { // We require this to execute right away during the simulation, always ignore network and queue. - RideSetStatusAction gameAction = RideSetStatusAction(id, RideStatus::Simulating); + RideSetStatusAction gameAction = RideSetStatusAction(id, RideStatus::simulating); GameActions::ExecuteNested(&gameAction); } } @@ -1398,7 +1398,7 @@ static void RideBreakdownUpdate(Ride& ride) if (ride.lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED)) return; - if (ride.status == RideStatus::Closed || ride.status == RideStatus::Simulating) + if (ride.status == RideStatus::closed || ride.status == RideStatus::simulating) return; if (!ride.CanBreakDown()) @@ -1933,7 +1933,7 @@ void CircusMusicUpdate(Ride& ride) */ void DefaultMusicUpdate(Ride& ride) { - if (ride.status != RideStatus::Open || !(ride.lifecycle_flags & RIDE_LIFECYCLE_MUSIC)) + if (ride.status != RideStatus::open || !(ride.lifecycle_flags & RIDE_LIFECYCLE_MUSIC)) { ride.music_tune_id = kTuneIDNull; return; @@ -2070,7 +2070,7 @@ void RideMeasurementsUpdate() for (auto& ride : GetRideManager()) { auto measurement = ride.measurement.get(); - if (measurement != nullptr && (ride.lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) && ride.status != RideStatus::Simulating) + if (measurement != nullptr && (ride.lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) && ride.status != RideStatus::simulating) { if (measurement->flags & RIDE_MEASUREMENT_FLAG_RUNNING) { @@ -2264,7 +2264,7 @@ void RideCheckAllReachable() if (ride.connected_message_throttle != 0) ride.connected_message_throttle--; - if (ride.status != RideStatus::Open || ride.connected_message_throttle != 0) + if (ride.status != RideStatus::open || ride.connected_message_throttle != 0) continue; if (ride.GetRideTypeDescriptor().HasFlag(RtdFlag::isShopOrFacility)) diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index cc7da51a59..ba50457ef0 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -628,11 +628,11 @@ enum enum class RideStatus : uint8_t { - Closed, - Open, - Testing, - Simulating, - Count, + closed, + open, + testing, + simulating, + count, }; enum class RideMode : uint8_t diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 647094460c..9a6b5645d4 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -106,7 +106,7 @@ static int32_t ride_check_if_construction_allowed(Ride& ride) return 0; } - if (ride.status != RideStatus::Closed && ride.status != RideStatus::Simulating) + if (ride.status != RideStatus::closed && ride.status != RideStatus::simulating) { ride.FormatNameTo(ft); ContextShowError(STR_CANT_START_CONSTRUCTION_ON, STR_MUST_BE_CLOSED_FIRST, ft); @@ -976,9 +976,9 @@ bool RideModify(const CoordsXYE& input) } // Stop the ride again to clear all vehicles and peeps (compatible with network games) - if (ride->status != RideStatus::Simulating) + if (ride->status != RideStatus::simulating) { - auto gameAction = RideSetStatusAction(ride->id, RideStatus::Closed); + auto gameAction = RideSetStatusAction(ride->id, RideStatus::closed); GameActions::Execute(&gameAction); } diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 6d998e718d..3633fc1cba 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -173,7 +173,7 @@ void RideRatingResetUpdateStates() void RideRatingsUpdateRide(const Ride& ride) { RideRatingUpdateState state; - if (ride.status != RideStatus::Closed) + if (ride.status != RideStatus::closed) { state.CurrentRide = ride.id; state.State = RIDE_RATINGS_STATE_INITIALISE; @@ -244,7 +244,7 @@ static bool RideRatingIsUpdatingRide(RideId id) static bool ShouldSkipRatingCalculation(const Ride& ride) { // Skip rides that are closed. - if (ride.status == RideStatus::Closed) + if (ride.status == RideStatus::closed) { return true; } @@ -348,7 +348,7 @@ static void ride_ratings_update_state_2(RideRatingUpdateState& state) { const RideId rideIndex = state.CurrentRide; auto ride = GetRide(rideIndex); - if (ride == nullptr || ride->status == RideStatus::Closed || ride->type >= RIDE_TYPE_COUNT) + if (ride == nullptr || ride->status == RideStatus::closed || ride->type >= RIDE_TYPE_COUNT) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; return; @@ -424,7 +424,7 @@ static void ride_ratings_update_state_2(RideRatingUpdateState& state) static void ride_ratings_update_state_3(RideRatingUpdateState& state) { auto ride = GetRide(state.CurrentRide); - if (ride == nullptr || ride->status == RideStatus::Closed) + if (ride == nullptr || ride->status == RideStatus::closed) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; return; @@ -456,7 +456,7 @@ static void ride_ratings_update_state_4(RideRatingUpdateState& state) static void ride_ratings_update_state_5(RideRatingUpdateState& state) { auto ride = GetRide(state.CurrentRide); - if (ride == nullptr || ride->status == RideStatus::Closed) + if (ride == nullptr || ride->status == RideStatus::closed) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; return; @@ -521,7 +521,7 @@ static void ride_ratings_update_state_5(RideRatingUpdateState& state) static void ride_ratings_begin_proximity_loop(RideRatingUpdateState& state) { auto ride = GetRide(state.CurrentRide); - if (ride == nullptr || ride->status == RideStatus::Closed) + if (ride == nullptr || ride->status == RideStatus::closed) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; return; @@ -1182,7 +1182,7 @@ static void RideRatingsCalculateValue(Ride& ride) const auto& rideManager = GetRideManager(); auto rideType = ride.type; auto otherRidesOfSameType = std::count_if(rideManager.begin(), rideManager.end(), [rideType](const Ride& r) { - return r.status == RideStatus::Open && r.type == rideType; + return r.status == RideStatus::open && r.type == rideType; }); if (otherRidesOfSameType > 1) value -= value / 4; diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index 1812afbf48..ff68b5cd09 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -64,7 +64,7 @@ static void RideUpdateStationBlockSection(Ride& ride, StationIndex stationIndex) TileElement* tileElement = RideGetStationStartTrackElement(ride, stationIndex); auto& station = ride.GetStation(stationIndex); - if ((ride.status == RideStatus::Closed && ride.num_riders == 0) + if ((ride.status == RideStatus::closed && ride.num_riders == 0) || (tileElement != nullptr && tileElement->AsTrack()->IsBrakeClosed())) { station.Depart &= ~kStationDepartFlag; @@ -96,7 +96,7 @@ static void RideUpdateStationDodgems(Ride& ride, StationIndex stationIndex) // Change of station depart flag should really call invalidate_station_start // but since dodgems do not have station lights there is no point. - if (ride.status == RideStatus::Closed || (ride.lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))) + if (ride.status == RideStatus::closed || (ride.lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))) { station.Depart &= ~kStationDepartFlag; return; @@ -157,7 +157,7 @@ static void RideUpdateStationNormal(Ride& ride, StationIndex stationIndex) int32_t time = station.Depart & kStationDepartMask; const auto currentTicks = GetGameState().CurrentTicks; if ((ride.lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED)) - || (ride.status == RideStatus::Closed && ride.num_riders == 0)) + || (ride.status == RideStatus::closed && ride.num_riders == 0)) { if (time != 0 && time != 127 && !(currentTicks & 7)) time--; @@ -190,7 +190,7 @@ static void RideUpdateStationNormal(Ride& ride, StationIndex stationIndex) static void RideUpdateStationRace(Ride& ride, StationIndex stationIndex) { auto& station = ride.GetStation(stationIndex); - if (ride.status == RideStatus::Closed || (ride.lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))) + if (ride.status == RideStatus::closed || (ride.lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))) { if (station.Depart & kStationDepartFlag) { diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index d464afa59c..22db95f165 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -1469,7 +1469,7 @@ void Vehicle::TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_se if (curRide == nullptr) return; - if (curRide->status == RideStatus::Open && !(curRide->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) + if (curRide->status == RideStatus::open && !(curRide->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) && !HasFlag(VehicleFlags::ReadyToDepart)) { return; @@ -1479,7 +1479,7 @@ void Vehicle::TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_se { // Original code did not check if the ride was a boat hire, causing empty boats to leave the platform when closing a // Boat Hire with passengers on it. - if (curRide->status != RideStatus::Closed || (curRide->num_riders != 0 && curRide->type != RIDE_TYPE_BOAT_HIRE)) + if (curRide->status != RideStatus::closed || (curRide->num_riders != 0 && curRide->type != RIDE_TYPE_BOAT_HIRE)) { curRide->GetStation(current_station).TrainAtStation = RideStation::kNoTrain; sub_state = 2; @@ -1594,7 +1594,7 @@ void Vehicle::UpdateWaitingForPassengers() num_seats_on_train &= 0x7F; - if (curRide->SupportsStatus(RideStatus::Testing)) + if (curRide->SupportsStatus(RideStatus::testing)) { if (time_waiting < 20) { @@ -1775,7 +1775,7 @@ void Vehicle::UpdateWaitingToDepart() } bool skipCheck = false; - if (shouldBreak || curRide->status != RideStatus::Open) + if (shouldBreak || curRide->status != RideStatus::open) { if (curRide->mode == RideMode::ForwardRotation || curRide->mode == RideMode::BackwardRotation) { @@ -2155,7 +2155,7 @@ static bool ride_station_can_depart_synchronised(const Ride& ride, StationIndex if (!(sv_ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { - if (sv_ride->status != RideStatus::Closed) + if (sv_ride->status != RideStatus::closed) { if (sv_ride->IsBlockSectioned()) { @@ -2828,7 +2828,7 @@ void Vehicle::UpdateCollisionSetup() if (curRide == nullptr) return; - if (curRide->status == RideStatus::Simulating) + if (curRide->status == RideStatus::simulating) { SimulateCrash(); return; @@ -2847,10 +2847,10 @@ void Vehicle::UpdateCollisionSetup() curRide->Crash(trainIndex.value()); - if (curRide->status != RideStatus::Closed) + if (curRide->status != RideStatus::closed) { // We require this to execute right away during the simulation, always ignore network and queue. - auto gameAction = RideSetStatusAction(curRide->id, RideStatus::Closed); + auto gameAction = RideSetStatusAction(curRide->id, RideStatus::closed); GameActions::ExecuteNested(&gameAction); } } @@ -2922,7 +2922,7 @@ static constexpr CoordsXY stru_9A3AC4[] = { void Vehicle::UpdateCrashSetup() { auto curRide = GetRide(); - if (curRide != nullptr && curRide->status == RideStatus::Simulating) + if (curRide != nullptr && curRide->status == RideStatus::simulating) { SimulateCrash(); return; @@ -4065,7 +4065,7 @@ void Vehicle::UpdateSwinging() current_time = -1; NumSwings++; - if (curRide->status != RideStatus::Closed) + if (curRide->status != RideStatus::closed) { // It takes 3 swings to get into full swing // ride->rotations already takes this into account @@ -4156,7 +4156,7 @@ void Vehicle::UpdateFerrisWheelRotating() if (subState == Pitch) { bool shouldStop = true; - if (curRide->status != RideStatus::Closed) + if (curRide->status != RideStatus::closed) { if (NumRotations < curRide->rotations) shouldStop = false; @@ -4287,7 +4287,7 @@ void Vehicle::UpdateRotating() if (_vehicleBreakdown != BREAKDOWN_CONTROL_FAILURE) { bool shouldStop = true; - if (curRide->status != RideStatus::Closed) + if (curRide->status != RideStatus::closed) { sprite = NumRotations + 1; if (curRide->type == RIDE_TYPE_ENTERPRISE) @@ -4613,7 +4613,7 @@ void Vehicle::CrashOnLand() if (curRide == nullptr) return; - if (curRide->status == RideStatus::Simulating) + if (curRide->status == RideStatus::simulating) { SimulateCrash(); return; @@ -4635,10 +4635,10 @@ void Vehicle::CrashOnLand() curRide->Crash(trainIndex.value()); - if (curRide->status != RideStatus::Closed) + if (curRide->status != RideStatus::closed) { // We require this to execute right away during the simulation, always ignore network and queue. - auto gameAction = RideSetStatusAction(curRide->id, RideStatus::Closed); + auto gameAction = RideSetStatusAction(curRide->id, RideStatus::closed); GameActions::ExecuteNested(&gameAction); } } @@ -4681,7 +4681,7 @@ void Vehicle::CrashOnWater() if (curRide == nullptr) return; - if (curRide->status == RideStatus::Simulating) + if (curRide->status == RideStatus::simulating) { SimulateCrash(); return; @@ -4703,10 +4703,10 @@ void Vehicle::CrashOnWater() curRide->Crash(trainIndex.value()); - if (curRide->status != RideStatus::Closed) + if (curRide->status != RideStatus::closed) { // We require this to execute right away during the simulation, always ignore network and queue. - auto gameAction = RideSetStatusAction(curRide->id, RideStatus::Closed); + auto gameAction = RideSetStatusAction(curRide->id, RideStatus::closed); GameActions::ExecuteNested(&gameAction); } } @@ -8905,7 +8905,7 @@ void Vehicle::SetState(Vehicle::Status vehicleStatus, uint8_t subState) bool Vehicle::IsGhost() const { auto r = GetRide(); - return r != nullptr && r->status == RideStatus::Simulating; + return r != nullptr && r->status == RideStatus::simulating; } void Vehicle::EnableCollisionsForTrain() diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 205472e155..9c33f2f214 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -658,7 +658,7 @@ ObjectiveStatus Objective::Check10RollerCoasters() const BitSet type_already_counted; for (const auto& ride : GetRideManager()) { - if (ride.status == RideStatus::Open && ride.ratings.excitement >= MakeRideRating(6, 00) + if (ride.status == RideStatus::open && ride.ratings.excitement >= MakeRideRating(6, 00) && ride.subtype != kObjectEntryIndexNull) { auto rideEntry = ride.GetRideEntry(); @@ -760,7 +760,7 @@ ObjectiveStatus Objective::Check10RollerCoastersLength() const auto rcs = 0; for (const auto& ride : GetRideManager()) { - if (ride.status == RideStatus::Open && ride.ratings.excitement >= MakeRideRating(7, 00) + if (ride.status == RideStatus::open && ride.ratings.excitement >= MakeRideRating(7, 00) && ride.subtype != kObjectEntryIndexNull) { auto rideEntry = ride.GetRideEntry(); @@ -792,7 +792,7 @@ ObjectiveStatus Objective::CheckFinish5RollerCoasters() const auto rcs = 0; for (const auto& ride : GetRideManager()) { - if (ride.status != RideStatus::Closed && ride.ratings.excitement >= MinimumExcitement) + if (ride.status != RideStatus::closed && ride.ratings.excitement >= MinimumExcitement) { auto rideEntry = ride.GetRideEntry(); if (rideEntry != nullptr) diff --git a/src/openrct2/scripting/bindings/ride/ScRide.cpp b/src/openrct2/scripting/bindings/ride/ScRide.cpp index 8ab5a0d569..050022516d 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.cpp @@ -91,15 +91,15 @@ namespace OpenRCT2::Scripting { switch (ride->status) { - case RideStatus::Closed: + case RideStatus::closed: return "closed"; - case RideStatus::Open: + case RideStatus::open: return "open"; - case RideStatus::Testing: + case RideStatus::testing: return "testing"; - case RideStatus::Simulating: + case RideStatus::simulating: return "simulating"; - case RideStatus::Count: // Meaningless but necessary to satisfy -Wswitch + case RideStatus::count: // Meaningless but necessary to satisfy -Wswitch return "count"; } } diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 8b81916c4f..688e1ed5fe 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -89,7 +89,7 @@ namespace OpenRCT2::Park bool ridePricesUnlocked = RidePricesUnlocked() && !(GetGameState().Park.Flags & PARK_FLAGS_NO_MONEY); for (auto& ride : GetRideManager()) { - if (ride.status != RideStatus::Open) + if (ride.status != RideStatus::open) continue; if (ride.lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) continue; @@ -122,7 +122,7 @@ namespace OpenRCT2::Park for (auto& ride : GetRideManager()) { - if (ride.status != RideStatus::Open) + if (ride.status != RideStatus::open) continue; if (ride.lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) continue; diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index f268ae122d..f0509d0a80 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -113,7 +113,7 @@ TEST_F(PlayTests, SecondGuestInQueueShouldNotRideIfNoFunds) Ride& ferrisWheel = *it; // Open it for free - execute(ferrisWheel.id, RideStatus::Open); + execute(ferrisWheel.id, RideStatus::open); execute(ferrisWheel.id, 0, true); // Ignore intensity to stimulate peeps to queue into ferris wheel @@ -172,7 +172,7 @@ TEST_F(PlayTests, CarRideWithOneCarOnlyAcceptsTwoGuests) Ride& carRide = *it; // Open it for free - execute(carRide.id, RideStatus::Open); + execute(carRide.id, RideStatus::open); execute(carRide.id, 0, true); // Ignore intensity to stimulate peeps to queue into the ride