From 76b918e7ed2570265aec9f9fff86fb34e42f2870 Mon Sep 17 00:00:00 2001 From: Stephan Spengler Date: Tue, 17 Jan 2023 01:32:54 +0100 Subject: [PATCH] Change openrct2/ride methods to UpperCamelCase, part 1 --- src/openrct2-ui/WindowManager.cpp | 8 +- .../interface/ViewportInteraction.cpp | 10 +- src/openrct2-ui/ride/Construction.cpp | 8 +- .../windows/DemolishRidePrompt.cpp | 4 +- .../windows/EditorInventionsList.cpp | 4 +- .../windows/EditorObjectiveOptions.cpp | 4 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 14 +- src/openrct2-ui/windows/GuestList.cpp | 6 +- src/openrct2-ui/windows/InstallTrack.cpp | 4 +- src/openrct2-ui/windows/Map.cpp | 4 +- src/openrct2-ui/windows/MazeConstruction.cpp | 20 +- src/openrct2-ui/windows/NewCampaign.cpp | 12 +- src/openrct2-ui/windows/NewRide.cpp | 4 +- src/openrct2-ui/windows/Park.cpp | 2 +- .../windows/RefurbishRidePrompt.cpp | 4 +- src/openrct2-ui/windows/Ride.cpp | 267 ++++++++------- src/openrct2-ui/windows/RideConstruction.cpp | 313 +++++++++--------- src/openrct2-ui/windows/RideList.cpp | 16 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2-ui/windows/TrackDesignManage.cpp | 4 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 10 +- src/openrct2-ui/windows/TrackList.cpp | 4 +- src/openrct2/Editor.cpp | 2 +- src/openrct2/Game.cpp | 6 +- src/openrct2/GameState.cpp | 10 +- src/openrct2/ReplayManager.cpp | 2 +- src/openrct2/actions/CheatSetAction.cpp | 4 +- src/openrct2/actions/LandSetHeightAction.cpp | 2 +- src/openrct2/actions/MazePlaceTrackAction.cpp | 6 +- src/openrct2/actions/MazeSetTrackAction.cpp | 6 +- src/openrct2/actions/RideCreateAction.cpp | 18 +- src/openrct2/actions/RideDemolishAction.cpp | 10 +- .../actions/RideEntranceExitPlaceAction.cpp | 6 +- .../actions/RideEntranceExitRemoveAction.cpp | 8 +- .../actions/RideFreezeRatingAction.cpp | 4 +- .../actions/RideSetAppearanceAction.cpp | 12 +- src/openrct2/actions/RideSetNameAction.cpp | 4 +- src/openrct2/actions/RideSetPriceAction.cpp | 8 +- src/openrct2/actions/RideSetSettingAction.cpp | 14 +- src/openrct2/actions/RideSetStatusAction.cpp | 10 +- src/openrct2/actions/RideSetVehicleAction.cpp | 16 +- src/openrct2/actions/TrackDesignAction.cpp | 20 +- src/openrct2/actions/TrackPlaceAction.cpp | 10 +- src/openrct2/actions/TrackRemoveAction.cpp | 12 +- src/openrct2/actions/WallPlaceAction.cpp | 2 +- src/openrct2/entity/Guest.cpp | 98 +++--- src/openrct2/entity/Peep.cpp | 34 +- src/openrct2/entity/Staff.cpp | 26 +- src/openrct2/interface/InteractiveConsole.cpp | 16 +- src/openrct2/interface/Viewport.cpp | 4 +- src/openrct2/management/Award.cpp | 8 +- src/openrct2/management/Marketing.cpp | 4 +- src/openrct2/management/NewsItem.cpp | 4 +- src/openrct2/management/Research.cpp | 4 +- src/openrct2/network/NetworkBase.cpp | 2 +- .../paint/tile_element/Paint.Entrance.cpp | 4 +- .../paint/tile_element/Paint.LargeScenery.cpp | 2 +- .../paint/tile_element/Paint.Path.cpp | 4 +- .../paint/tile_element/Paint.SmallScenery.cpp | 2 +- .../paint/tile_element/Paint.Wall.cpp | 2 +- src/openrct2/park/ParkFile.cpp | 4 +- src/openrct2/peep/GuestPathfinding.cpp | 6 +- src/openrct2/rct1/S4Importer.cpp | 12 +- src/openrct2/rct12/RCT12.cpp | 4 +- src/openrct2/rct2/RCT2.cpp | 8 +- src/openrct2/rct2/S6Importer.cpp | 4 +- src/openrct2/ride/CableLift.cpp | 6 +- src/openrct2/ride/CableLift.h | 2 +- src/openrct2/ride/Ride.cpp | 292 ++++++++-------- src/openrct2/ride/Ride.h | 132 ++++---- src/openrct2/ride/RideAudio.cpp | 4 +- src/openrct2/ride/RideConstruction.cpp | 148 ++++----- src/openrct2/ride/RideConstruction.h | 22 +- src/openrct2/ride/RideEntry.h | 2 +- src/openrct2/ride/RideRatings.cpp | 52 +-- src/openrct2/ride/RideRatings.h | 6 +- src/openrct2/ride/ShopItem.cpp | 4 +- src/openrct2/ride/ShopItem.h | 4 +- src/openrct2/ride/Station.cpp | 16 +- src/openrct2/ride/Station.h | 8 +- src/openrct2/ride/Track.cpp | 66 ++-- src/openrct2/ride/Track.h | 28 +- src/openrct2/ride/TrackDesign.cpp | 10 +- src/openrct2/ride/TrackDesign.h | 12 +- src/openrct2/ride/TrackDesignRepository.cpp | 8 +- src/openrct2/ride/TrackDesignRepository.h | 8 +- src/openrct2/ride/TrackDesignSave.cpp | 16 +- src/openrct2/ride/TrackPaint.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 92 ++--- src/openrct2/ride/Vehicle.h | 8 +- src/openrct2/ride/VehiclePaint.cpp | 26 +- src/openrct2/ride/VehiclePaint.h | 20 +- .../ride/coaster/ReverserRollerCoaster.cpp | 4 +- src/openrct2/ride/coaster/VirginiaReel.cpp | 2 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 2 +- src/openrct2/ride/gentle/MiniGolf.cpp | 2 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 2 +- src/openrct2/ride/thrill/RotoDrop.cpp | 2 +- src/openrct2/ride/water/RiverRapids.cpp | 4 +- src/openrct2/ride/water/SplashBoats.cpp | 2 +- src/openrct2/ride/water/SubmarineRide.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 16 +- .../scripting/bindings/ride/ScRide.cpp | 2 +- .../scripting/bindings/ride/ScRideStation.cpp | 2 +- .../bindings/ride/ScTrackIterator.cpp | 8 +- .../bindings/ride/ScTrackSegment.cpp | 2 +- .../bindings/world/ScTileElement.cpp | 16 +- src/openrct2/windows/_legacy.cpp | 8 +- src/openrct2/world/Banner.cpp | 4 +- src/openrct2/world/ConstructionClearance.cpp | 4 +- src/openrct2/world/Entrance.cpp | 2 +- src/openrct2/world/Footpath.cpp | 12 +- src/openrct2/world/Map.cpp | 4 +- src/openrct2/world/MapAnimation.cpp | 2 +- src/openrct2/world/Park.cpp | 4 +- src/openrct2/world/TileInspector.cpp | 10 +- test/tests/MultiLaunch.cpp | 4 +- test/tests/PlayTests.cpp | 2 +- test/tests/RideRatings.cpp | 4 +- test/tests/S6ImportExportTests.cpp | 2 +- 121 files changed, 1146 insertions(+), 1148 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 5a6f300462..8e02721636 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -192,9 +192,9 @@ public: case WD_NEW_CAMPAIGN: return WindowNewCampaignOpen(id); case WD_DEMOLISH_RIDE: - return WindowRideDemolishPromptOpen(*get_ride(RideId::FromUnderlying(id))); + return WindowRideDemolishPromptOpen(*GetRide(RideId::FromUnderlying(id))); case WD_REFURBISH_RIDE: - return WindowRideRefurbishPromptOpen(*get_ride(RideId::FromUnderlying(id))); + return WindowRideRefurbishPromptOpen(*GetRide(RideId::FromUnderlying(id))); case WD_SIGN: return WindowSignOpen(id); case WD_SIGN_SMALL: @@ -270,7 +270,7 @@ public: case WindowClass::Ride: { const auto rideId = RideId::FromUnderlying(intent->GetSIntExtra(INTENT_EXTRA_RIDE_ID)); - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); return ride == nullptr ? nullptr : WindowRideMainOpen(*ride); } case WindowClass::TrackDesignPlace: @@ -408,7 +408,7 @@ public: } else { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentRideIndex = RideId::FromUnderlying(rideIndex); } break; diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index b6ed9d48bd..0957f21ce8 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -121,7 +121,7 @@ InteractionInfo ViewportInteractionGetItemLeft(const ScreenCoordsXY& screenCoord } break; case ViewportInteractionItem::Ride: - ride_set_map_tooltip(tileElement); + RideSetMapTooltip(tileElement); break; case ViewportInteractionItem::ParkEntrance: { @@ -277,7 +277,7 @@ InteractionInfo ViewportInteractionGetItemRight(const ScreenCoordsXY& screenCoor info.SpriteType = ViewportInteractionItem::None; return info; } - ride = get_ride(vehicle->ride); + ride = GetRide(vehicle->ride); if (ride != nullptr && ride->status == RideStatus::Closed) { auto ft = Formatter(); @@ -300,7 +300,7 @@ InteractionInfo ViewportInteractionGetItemRight(const ScreenCoordsXY& screenCoor return info; } - ride = get_ride(tileElement->GetRideIndex()); + ride = GetRide(tileElement->GetRideIndex()); if (ride == nullptr) { info.SpriteType = ViewportInteractionItem::None; @@ -555,7 +555,7 @@ bool ViewportInteractionRightClick(const ScreenCoordsXY& screenCoords) { break; } - auto ride = get_ride(vehicle->ride); + auto ride = GetRide(vehicle->ride); if (ride != nullptr) { RideConstructionStart(*ride); @@ -565,7 +565,7 @@ bool ViewportInteractionRightClick(const ScreenCoordsXY& screenCoords) break; case ViewportInteractionItem::Ride: tileElement = { info.Loc, info.Element }; - ride_modify(tileElement); + RideModify(tileElement); break; case ViewportInteractionItem::Scenery: ViewportInteractionRemoveScenery(info.Element, info.Loc); diff --git a/src/openrct2-ui/ride/Construction.cpp b/src/openrct2-ui/ride/Construction.cpp index c72e120538..a0ebf83ac8 100644 --- a/src/openrct2-ui/ride/Construction.cpp +++ b/src/openrct2-ui/ride/Construction.cpp @@ -20,9 +20,9 @@ */ void ride_construct_new(RideSelection listItem) { - int32_t rideEntryIndex = ride_get_entry_index(listItem.Type, listItem.EntryIndex); - int32_t colour1 = ride_get_random_colour_preset_index(listItem.Type); - int32_t colour2 = ride_get_unused_preset_vehicle_colour(rideEntryIndex); + int32_t rideEntryIndex = RideGetEntryIndex(listItem.Type, listItem.EntryIndex); + int32_t colour1 = RideGetRandomColourPresetIndex(listItem.Type); + int32_t colour2 = RideGetUnusedPresetVehicleColour(rideEntryIndex); auto gameAction = RideCreateAction(listItem.Type, listItem.EntryIndex, colour1, colour2, gLastEntranceStyle); @@ -30,7 +30,7 @@ void ride_construct_new(RideSelection listItem) if (result->Error != GameActions::Status::Ok) return; const auto rideIndex = result->GetData(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); RideConstructionStart(*ride); }); diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 825e92e1bd..e5ec5ba973 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -48,7 +48,7 @@ public: void SetRide(const Ride& currentRide) { rideId = currentRide.id; - _demolishRideCost = -ride_get_refund_price(currentRide); + _demolishRideCost = -RideGetRefundPrice(currentRide); } void OnOpen() override @@ -78,7 +78,7 @@ public: { WindowDrawWidgets(*this, &dpi); - auto currentRide = get_ride(rideId); + auto currentRide = GetRide(rideId); if (currentRide != nullptr) { auto stringId = (gParkFlags & PARK_FLAGS_NO_MONEY) ? STR_DEMOLISH_RIDE_ID : STR_DEMOLISH_RIDE_ID_MONEY; diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 664c08aca1..0455d29d2c 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -105,7 +105,7 @@ static void DrawResearchItem( if (researchItem.type == Research::EntryType::Ride && !GetRideTypeDescriptor(researchItem.baseRideType).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { - const StringId rideTypeName = get_ride_naming(researchItem.baseRideType, *get_ride_entry(researchItem.entryIndex)).Name; + const StringId rideTypeName = GetRideNaming(researchItem.baseRideType, *get_ride_entry(researchItem.entryIndex)).Name; // Draw group name auto ft = Formatter(); @@ -413,7 +413,7 @@ public: && !GetRideTypeDescriptor(researchItem->baseRideType).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { drawString = STR_WINDOW_COLOUR_2_STRINGID_STRINGID; - StringId rideTypeName = get_ride_naming(researchItem->baseRideType, *get_ride_entry(researchItem->entryIndex)).Name; + StringId rideTypeName = GetRideNaming(researchItem->baseRideType, *get_ride_entry(researchItem->entryIndex)).Name; ft.Add(rideTypeName); ft.Add(stringId); } diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index e857dce7d6..d64c0443a5 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -979,7 +979,7 @@ static void WindowEditorObjectiveOptionsRidesScrollmousedown( return; const auto rideId = RideId::FromUnderlying(w->list_item_positions[i]); - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride != nullptr) { ride->lifecycle_flags ^= RIDE_LIFECYCLE_INDESTRUCTIBLE; @@ -1073,7 +1073,7 @@ static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window* w, rct_draw // Checkbox mark const auto rideId = RideId::FromUnderlying(w->list_item_positions[i]); - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride != nullptr) { if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index f6071729bc..689444dae5 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -834,7 +834,7 @@ public: case ADVERTISING_CAMPAIGN_RIDE_FREE: case ADVERTISING_CAMPAIGN_RIDE: { - auto campaignRide = get_ride(marketingCampaign->RideId); + auto campaignRide = GetRide(marketingCampaign->RideId); if (campaignRide != nullptr) { campaignRide->FormatNameTo(ft); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 904a98b6c7..8352f4bc4d 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1337,7 +1337,7 @@ private: screenCoords.y = windowPos.y + widgets[WIDX_PAGE_BACKGROUND].bottom - 12; auto ft = Formatter(); - auto* r = get_ride(peep->FavouriteRide); + auto* r = GetRide(peep->FavouriteRide); if (r != nullptr) { r->FormatNameTo(ft); @@ -1366,7 +1366,7 @@ private: } const auto rId = RideId::FromUnderlying(list_item_positions[listIndex]); - auto* r = get_ride(rId); + auto* r = GetRide(rId); if (r != nullptr) { auto ft = Formatter(); @@ -1649,7 +1649,7 @@ private: ft.Add(ImageId(GetShopItemDescriptor(item).Image, (guest.BalloonColour)).ToUInt32()); break; case ShopItem::Photo: - invRide = get_ride(guest.Photo1RideRef); + invRide = GetRide(guest.Photo1RideRef); if (invRide != nullptr) { ft.Rewind(); @@ -1673,7 +1673,7 @@ private: ft.Add(parkName); break; case VOUCHER_TYPE_RIDE_FREE: - invRide = get_ride(guest.VoucherRideId); + invRide = GetRide(guest.VoucherRideId); if (invRide != nullptr) { ft.Rewind(); @@ -1706,7 +1706,7 @@ private: ft.Add(ImageId(GetShopItemDescriptor(item).Image, (guest.TshirtColour)).ToUInt32()); break; case ShopItem::Photo2: - invRide = get_ride(guest.Photo2RideRef); + invRide = GetRide(guest.Photo2RideRef); if (invRide != nullptr) { ft.Rewind(); @@ -1715,7 +1715,7 @@ private: } break; case ShopItem::Photo3: - invRide = get_ride(guest.Photo3RideRef); + invRide = GetRide(guest.Photo3RideRef); if (invRide != nullptr) { ft.Rewind(); @@ -1724,7 +1724,7 @@ private: } break; case ShopItem::Photo4: - invRide = get_ride(guest.Photo4RideRef); + invRide = GetRide(guest.Photo4RideRef); if (invRide != nullptr) { ft.Rewind(); diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index b96e56bb47..a6a0d3494f 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -183,7 +183,7 @@ public: { case GuestListFilterType::GuestsOnRide: { - auto guestRide = get_ride(RideId::FromUnderlying(index)); + auto guestRide = GetRide(RideId::FromUnderlying(index)); if (guestRide != nullptr) { ft.Add( @@ -199,7 +199,7 @@ public: } case GuestListFilterType::GuestsInQueue: { - auto guestRide = get_ride(RideId::FromUnderlying(index)); + auto guestRide = GetRide(RideId::FromUnderlying(index)); if (guestRide != nullptr) { ft.Add(STR_QUEUING_FOR); @@ -214,7 +214,7 @@ public: } case GuestListFilterType::GuestsThinkingAboutRide: { - auto guestRide = get_ride(RideId::FromUnderlying(index)); + auto guestRide = GetRide(RideId::FromUnderlying(index)); if (guestRide != nullptr) { ft.Add(STR_NONE); diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index d46d88cb96..540fe89651 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -201,7 +201,7 @@ public: if (objectEntry != nullptr) { auto groupIndex = object_manager_get_loaded_object_entry_index(objectEntry); - auto rideName = get_ride_naming(td6->type, *get_ride_entry(groupIndex)); + auto rideName = GetRideNaming(td6->type, *get_ride_entry(groupIndex)); ft.Add(rideName.Name); } else @@ -389,7 +389,7 @@ private: } else { - if (track_repository_install(_trackPath.c_str(), _trackName.c_str())) + if (TrackRepositoryInstall(_trackPath.c_str(), _trackName.c_str())) { Close(); } diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index e8bcb03d19..a24c699e31 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -1131,7 +1131,7 @@ private: { if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE) break; - Ride* targetRide = get_ride(tileElement->AsEntrance()->GetRideIndex()); + Ride* targetRide = GetRide(tileElement->AsEntrance()->GetRideIndex()); if (targetRide != nullptr) { const auto& colourKey = targetRide->GetRideTypeDescriptor().ColourKey; @@ -1141,7 +1141,7 @@ private: } case TileElementType::Track: { - Ride* targetRide = get_ride(tileElement->AsTrack()->GetRideIndex()); + Ride* targetRide = GetRide(tileElement->AsTrack()->GetRideIndex()); if (targetRide != nullptr) { const auto& colourKey = targetRide->GetRideTypeDescriptor().ColourKey; diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index f7fc69084b..8e85c6fecb 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -106,7 +106,7 @@ public: void OnClose() override { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); ViewportSetVisibility(0); MapInvalidateMapSelectionTiles(); @@ -119,7 +119,7 @@ public: HideGridlines(); - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide != nullptr) { if (currentRide->overall_view.IsNull()) @@ -209,7 +209,7 @@ public: void OnUpdate() override { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr || currentRide->status != RideStatus::Closed) { Close(); @@ -283,7 +283,7 @@ public: void OnPrepareDraw() override { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); auto ft = Formatter::Common(); if (currentRide != nullptr) { @@ -313,7 +313,7 @@ private: gRideEntranceExitPlaceStationIndex = StationIndex::FromUnderlying(0); input_set_flag(INPUT_FLAG_6, true); - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState != RideConstructionState::EntranceExit) { @@ -336,14 +336,14 @@ private: void WindowMazeConstructionEntranceTooldown(const ScreenCoordsXY& screenCoords) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); MapInvalidateSelectionRect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - CoordsXYZD entranceOrExitCoords = ride_get_entrance_or_exit_position_from_screen_position(screenCoords); + CoordsXYZD entranceOrExitCoords = RideGetEntranceOrExitPositionFromScreenPosition(screenCoords); if (entranceOrExitCoords.IsNull()) return; @@ -362,8 +362,8 @@ private: OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position); - auto currentRide = get_ride(rideIndex); - if (currentRide != nullptr && ride_are_all_possible_entrances_and_exits_built(*currentRide).Successful) + auto currentRide = GetRide(rideIndex); + if (currentRide != nullptr && RideAreAllPossibleEntrancesAndExitsBuilt(*currentRide).Successful) { ToolCancel(); if (currentRide->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_NO_TRACK)) @@ -390,7 +390,7 @@ private: _currentTrackSelectionFlags = 0; _rideConstructionNextArrowPulse = 0; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); x = _currentTrackBegin.x + (CoordsDirectionDelta[direction].x / 2); y = _currentTrackBegin.y + (CoordsDirectionDelta[direction].y / 2); diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index c78242c33c..7a402b61a1 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -65,12 +65,12 @@ private: static bool RideValueCompare(const RideId& a, const RideId& b) { auto valueA = 0; - auto rideA = get_ride(a); + auto rideA = GetRide(a); if (rideA != nullptr) valueA = rideA->value; auto valueB = 0; - auto rideB = get_ride(b); + auto rideB = GetRide(b); if (rideB != nullptr) valueB = rideB->value; @@ -80,12 +80,12 @@ private: static int32_t RideNameCompare(const RideId& a, const RideId& b) { std::string rideAName = ""; - auto rideA = get_ride(a); + auto rideA = GetRide(a); if (rideA != nullptr) rideAName = rideA->GetName(); std::string rideBName = ""; - auto rideB = get_ride(b); + auto rideB = GetRide(b); if (rideB != nullptr) rideBName = rideB->GetName(); @@ -210,7 +210,7 @@ public: int32_t numItems = 0; for (auto rideIndex : RideList) { - auto curRide = get_ride(rideIndex); + auto curRide = GetRide(rideIndex); if (curRide != nullptr) { // HACK until dropdown items have longer argument buffers @@ -311,7 +311,7 @@ public: widgets[WIDX_RIDE_LABEL].text = STR_MARKETING_RIDE; if (campaign.RideId != RideId::GetNull()) { - auto curRide = get_ride(campaign.RideId); + auto curRide = GetRide(campaign.RideId); if (curRide != nullptr) { widgets[WIDX_RIDE_DROPDOWN].text = STR_STRINGID; diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index f8dd68eb60..f17ac0c911 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -551,7 +551,7 @@ private: { if (GetRideTypeDescriptor(item.Type).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { - entryName = get_ride_entry_name(item.EntryIndex); + entryName = GetRideEntryName(item.EntryIndex); } } @@ -825,7 +825,7 @@ private: void DrawRideInformation(rct_drawpixelinfo& dpi, RideSelection item, const ScreenCoordsXY& screenPos, int32_t textWidth) { rct_ride_entry* rideEntry = get_ride_entry(item.EntryIndex); - RideNaming rideNaming = get_ride_naming(item.Type, *rideEntry); + RideNaming rideNaming = GetRideNaming(item.Type, *rideEntry); auto ft = Formatter(); UpdateVehicleAvailability(item.Type); diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 1189f86a90..bdaaed201d 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -920,7 +920,7 @@ private: WidgetInvalidate(*this, WIDX_TAB_5); // Invalidate ride count if changed - const auto rideCount = ride_get_count(); + const auto rideCount = RideGetCount(); if (_numberOfRides != rideCount) { _numberOfRides = rideCount; diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index 1acc024774..53470ab24f 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -47,7 +47,7 @@ public: void SetRide(const Ride& currentRide) { rideId = currentRide.id; - _demolishRideCost = -ride_get_refund_price(currentRide); + _demolishRideCost = -RideGetRefundPrice(currentRide); } void OnOpen() override @@ -77,7 +77,7 @@ public: { WindowDrawWidgets(*this, &dpi); - auto currentRide = get_ride(rideId); + auto currentRide = GetRide(rideId); if (currentRide != nullptr) { auto stringId = (gParkFlags & PARK_FLAGS_NO_MONEY) ? STR_REFURBISH_RIDE_ID_NO_MONEY : STR_REFURBISH_RIDE_ID_MONEY; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index b578e2f757..d136f3d3e1 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -888,7 +888,7 @@ static void WindowRideDrawTabMain(rct_drawpixelinfo* dpi, rct_window* w) WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast(WINDOW_RIDE_PAGE_MAIN); if (!WidgetIsDisabled(*w, widgetIndex)) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { int32_t spriteIndex = 0; @@ -944,7 +944,7 @@ static void WindowRideDrawTabVehicle(rct_drawpixelinfo* dpi, rct_window* w) screenCoords = ScreenCoordsXY{ widget.width() / 2, widget.height() - 12 }; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -969,11 +969,11 @@ static void WindowRideDrawTabVehicle(rct_drawpixelinfo* dpi, rct_window* w) screenCoords.y /= 4; } - const auto vehicle = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, rideEntry->TabCar); + const auto vehicle = RideEntryGetVehicleAtPosition(ride->subtype, ride->num_cars_per_train, rideEntry->TabCar); CarEntry* carEntry = &rideEntry->Cars[vehicle]; auto vehicleId = ((ride->colour_scheme_type & 3) == VEHICLE_COLOUR_SCHEME_PER_VEHICLE) ? rideEntry->TabCar : 0; - VehicleColour vehicleColour = ride_get_vehicle_colour(*ride, vehicleId); + VehicleColour vehicleColour = RideGetVehicleColour(*ride, vehicleId); // imageIndex represents a precision of 64 auto imageIndex = OpenRCT2::Entity::Yaw::YawFrom4(2) * 2; @@ -1036,7 +1036,7 @@ static void WindowRideDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w) static void WindowRideDisableTabs(rct_window* w) { uint32_t disabled_tabs = 0; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -1279,7 +1279,7 @@ rct_window* WindowRideOpenTrack(TileElement* tileElement) auto rideIndex = tileElement->GetRideIndex(); if (!rideIndex.IsNull()) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { const auto type = tileElement->GetType(); @@ -1475,7 +1475,7 @@ static void WindowRideAnchorBorderWidgets(rct_window* w) static std::optional GetStationIndexFromViewSelection(const rct_window& w) { - const auto* ride = get_ride(RideId::FromUnderlying(w.number)); + const auto* ride = GetRide(RideId::FromUnderlying(w.number)); if (ride == nullptr) return std::nullopt; @@ -1505,7 +1505,7 @@ static void WindowRideInitViewport(rct_window* w) if (w->page != WINDOW_RIDE_PAGE_MAIN) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -1602,7 +1602,7 @@ static void WindowRideInitViewport(rct_window* w) */ static void WindowRideRename(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { auto rideName = ride->GetName(); @@ -1636,7 +1636,7 @@ static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex) break; case WIDX_CONSTRUCTION: { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { RideConstructionStart(*ride); @@ -1658,7 +1658,7 @@ static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex) case WIDX_TEST_LIGHT: case WIDX_OPEN_LIGHT: { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { RideStatus status; @@ -1697,7 +1697,7 @@ static void WindowRideMainResize(rct_window* w) { minHeight += 20 + RCT1_LIGHT_OFFSET; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { #ifdef __SIMULATE_IN_RIDE_WINDOW__ @@ -1731,7 +1731,7 @@ static void WindowRideMainResize(rct_window* w) static void WindowRideShowViewDropdown(rct_window* w, Widget* widget) { Widget* dropdownWidget = widget - 1; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -1842,7 +1842,7 @@ static void WindowRideSetDropdown(RideStatusDropdownInfo& info, RideStatus statu static void WindowRideShowOpenDropdown(rct_window* w, Widget* widget) { RideStatusDropdownInfo info; - info.Ride = get_ride(w->rideId); + info.Ride = GetRide(w->rideId); if (info.Ride == nullptr) return; @@ -1910,7 +1910,7 @@ static void PopulateRideTypeDropdown() static void WindowRideShowRideTypeDropdown(rct_window* w, Widget* widget) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -1945,7 +1945,7 @@ static void WindowRideShowRideTypeDropdown(rct_window* w, Widget* widget) static void WindowRideShowLocateDropdown(rct_window* w, Widget* widget) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -1964,7 +1964,7 @@ static void WindowRideShowLocateDropdown(rct_window* w, Widget* widget) static void WindowRideMainFollowRide(rct_window* w) { - auto* ride = get_ride(w->rideId); + auto* ride = GetRide(w->rideId); if (ride != nullptr) { if (!(ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAIN)) @@ -2053,7 +2053,7 @@ static void PopulateVehicleTypeDropdown(const Ride& ride, bool forceRefresh) static void WindowRideShowVehicleTypeDropdown(rct_window* w, Widget* widget) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2124,7 +2124,7 @@ static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32 if (dropdownIndex == -1) { dropdownIndex = w->ride.view + 1; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { if (dropdownIndex != 0 && dropdownIndex <= ride->NumTrains @@ -2145,7 +2145,7 @@ static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32 break; case WIDX_OPEN: { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { auto status = RideStatus::Closed; @@ -2189,7 +2189,7 @@ static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32 // Will get set to the correct Alternative variable during set_default_next_piece. // TODO: Rework construction window to prevent the need for this. _currentTrackAlternative = RIDE_TYPE_NO_ALTERNATIVES; - ride_construction_set_default_next_piece(); + RideConstructionSetDefaultNextPiece(); }); GameActions::Execute(&rideSetSetting); } @@ -2222,7 +2222,7 @@ static void WindowRideMainUpdate(rct_window* w) WidgetInvalidate(*w, WIDX_TAB_1); // Update status - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { if (!(ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAIN)) @@ -2257,7 +2257,7 @@ static void WindowRideMainTextinput(rct_window* w, WidgetIndex widgetIndex, char if (widgetIndex != WIDX_RENAME || text == nullptr) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { auto gameAction = RideSetNameAction(ride->id, text); @@ -2292,7 +2292,7 @@ static void WindowRideMainInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2426,7 +2426,7 @@ static void WindowRideMainInvalidate(rct_window* w) static StringId WindowRideGetStatusOverallView(rct_window* w, Formatter& ft) { auto stringId = STR_NONE; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { ride->FormatStatusTo(ft); @@ -2445,7 +2445,7 @@ static StringId WindowRideGetStatusOverallView(rct_window* w, Formatter& ft) */ static StringId WindowRideGetStatusVehicle(rct_window* w, Formatter& ft) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return STR_EMPTY; @@ -2493,7 +2493,7 @@ static StringId WindowRideGetStatusVehicle(rct_window* w, Formatter& ft) */ static StringId WindowRideGetStatusStation(rct_window* w, Formatter& ft) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return STR_NONE; @@ -2545,7 +2545,7 @@ static StringId WindowRideGetStatusStation(rct_window* w, Formatter& ft) */ static StringId WindowRideGetStatus(rct_window* w, Formatter& ft) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (w->ride.view == 0) return WindowRideGetStatusOverallView(w, ft); if (ride != nullptr && w->ride.view <= ride->NumTrains) @@ -2575,7 +2575,7 @@ static void WindowRideMainPaint(rct_window* w, rct_drawpixelinfo* dpi) } // View dropdown - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2657,7 +2657,7 @@ static void WindowRideVehicleResize(rct_window* w) */ static void WindowRideVehicleMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2699,7 +2699,7 @@ static void WindowRideVehicleDropdown(rct_window* w, WidgetIndex widgetIndex, in case WIDX_VEHICLE_TYPE_DROPDOWN: if (dropdownIndex >= 0 && static_cast(dropdownIndex) < VehicleDropdownData.size()) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { auto newRideType = VehicleDropdownData[dropdownIndex].subtype_id; @@ -2723,7 +2723,7 @@ static void WindowRideVehicleUpdate(rct_window* w) static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return { STR_NONE, {} }; @@ -2790,7 +2790,7 @@ static void WindowRideVehicleInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2870,7 +2870,7 @@ static void WindowRideVehiclePaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowRideDrawTabImages(dpi, w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2945,7 +2945,7 @@ struct VehicleDrawInfo */ static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -2958,7 +2958,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t startX = std::max(2, (widget->width() - ((ride->NumTrains - 1) * 36)) / 2 - 25); int32_t startY = widget->height() - 4; - CarEntry* carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, 0)]; + CarEntry* carEntry = &rideEntry->Cars[RideEntryGetVehicleAtPosition(ride->subtype, ride->num_cars_per_train, 0)]; startY += carEntry->tab_height; // For each train @@ -2973,7 +2973,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, static_assert(std::numeric_limitsnum_cars_per_train)>::max() <= std::size(trainCarImages)); for (int32_t j = 0; j < ride->num_cars_per_train; j++) { - carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, j)]; + carEntry = &rideEntry->Cars[RideEntryGetVehicleAtPosition(ride->subtype, ride->num_cars_per_train, j)]; x += carEntry->spacing / 17432; y -= (carEntry->spacing / 2) / 17432; @@ -2991,7 +2991,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, vehicleColourIndex = j; break; } - VehicleColour vehicleColour = ride_get_vehicle_colour(*ride, vehicleColourIndex); + VehicleColour vehicleColour = RideGetVehicleColour(*ride, vehicleColourIndex); ImageIndex imageIndex = carEntry->SpriteByYaw(OpenRCT2::Entity::Yaw::BaseRotation / 2, SpriteGroupType::SlopeFlat); imageIndex &= carEntry->TabRotationMask; @@ -3034,7 +3034,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, */ static void WindowRideModeTweakIncrease(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3049,7 +3049,7 @@ static void WindowRideModeTweakIncrease(rct_window* w) uint8_t increment = ride->mode == RideMode::Dodgems ? 10 : 1; - set_operating_setting( + SetOperatingSetting( w->rideId, RideSetSetting::Operation, std::clamp(ride->operation_option + increment, minValue, maxValue)); } @@ -3059,7 +3059,7 @@ static void WindowRideModeTweakIncrease(rct_window* w) */ static void WindowRideModeTweakDecrease(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3073,7 +3073,7 @@ static void WindowRideModeTweakDecrease(rct_window* w) uint8_t decrement = ride->mode == RideMode::Dodgems ? 10 : 1; - set_operating_setting( + SetOperatingSetting( w->rideId, RideSetSetting::Operation, std::clamp(ride->operation_option - decrement, minValue, maxValue)); } @@ -3086,7 +3086,7 @@ static void WindowRideModeDropdown(rct_window* w, Widget* widget) Widget* dropdownWidget; dropdownWidget = widget - 1; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3125,7 +3125,7 @@ static void WindowRideModeDropdown(rct_window* w, Widget* widget) */ static void WindowRideLoadDropdown(rct_window* w, Widget* widget) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3149,7 +3149,7 @@ static void WindowRideLoadDropdown(rct_window* w, Widget* widget) static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex) { const auto rideId = w->rideId; - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride == nullptr) return; @@ -3171,20 +3171,19 @@ static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex) WindowRideSetPage(w, widgetIndex - WIDX_TAB_1); break; case WIDX_LOAD_CHECKBOX: - set_operating_setting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_LOAD); + SetOperatingSetting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_LOAD); break; case WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX: - set_operating_setting( - rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES); + SetOperatingSetting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES); break; case WIDX_MINIMUM_LENGTH_CHECKBOX: - set_operating_setting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_MINIMUM_LENGTH); + SetOperatingSetting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_MINIMUM_LENGTH); break; case WIDX_MAXIMUM_LENGTH_CHECKBOX: - set_operating_setting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_MAXIMUM_LENGTH); + SetOperatingSetting(rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_WAIT_FOR_MAXIMUM_LENGTH); break; case WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX: - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::Departure, ride->depart_flags ^ RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS); break; } @@ -3206,7 +3205,7 @@ static void WindowRideOperatingResize(rct_window* w) static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget) { const auto rideId = w->rideId; - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride == nullptr) return; @@ -3226,7 +3225,7 @@ static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, upper_bound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit : ride->GetRideTypeDescriptor().LiftData.maximum_speed; lower_bound = gCheatsUnlockOperatingLimits ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::LiftHillSpeed, std::clamp(ride->lift_hill_speed + 1, lower_bound, upper_bound)); break; @@ -3234,7 +3233,7 @@ static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, upper_bound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit : ride->GetRideTypeDescriptor().LiftData.maximum_speed; lower_bound = gCheatsUnlockOperatingLimits ? 0 : ride->GetRideTypeDescriptor().LiftData.minimum_speed; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::LiftHillSpeed, std::clamp(ride->lift_hill_speed - 1, lower_bound, upper_bound)); break; @@ -3247,28 +3246,28 @@ static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, case WIDX_MINIMUM_LENGTH_INCREASE: upper_bound = OpenRCT2::Limits::MaxWaitingTime; lower_bound = 0; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::MinWaitingTime, std::clamp(ride->min_waiting_time + 1, lower_bound, upper_bound)); break; case WIDX_MINIMUM_LENGTH_DECREASE: upper_bound = OpenRCT2::Limits::MaxWaitingTime; lower_bound = 0; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::MinWaitingTime, std::clamp(ride->min_waiting_time - 1, lower_bound, upper_bound)); break; case WIDX_MAXIMUM_LENGTH_INCREASE: upper_bound = OpenRCT2::Limits::MaxWaitingTime; lower_bound = 0; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::MaxWaitingTime, std::clamp(ride->max_waiting_time + 1, lower_bound, upper_bound)); break; case WIDX_MAXIMUM_LENGTH_DECREASE: upper_bound = OpenRCT2::Limits::MaxWaitingTime; lower_bound = 0; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::MaxWaitingTime, std::clamp(ride->max_waiting_time - 1, lower_bound, upper_bound)); break; @@ -3282,14 +3281,14 @@ static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, upper_bound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit : OpenRCT2::Limits::MaxCircuitsPerRide; lower_bound = 1; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::NumCircuits, std::clamp(ride->num_circuits + 1, lower_bound, upper_bound)); break; case WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE: upper_bound = gCheatsUnlockOperatingLimits ? OpenRCT2::Limits::CheatsMaxOperatingLimit : OpenRCT2::Limits::MaxCircuitsPerRide; lower_bound = 1; - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::NumCircuits, std::clamp(ride->num_circuits - 1, lower_bound, upper_bound)); break; } @@ -3297,7 +3296,7 @@ static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, static void WindowRideOperatingLengthWindow(rct_window* w, WidgetIndex widgetIndex) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3354,7 +3353,7 @@ static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex, return; const auto rideId = w->rideId; - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride == nullptr) return; @@ -3378,11 +3377,11 @@ static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex, } } if (rideMode != RideMode::NullMode) - set_operating_setting(rideId, RideSetSetting::Mode, static_cast(rideMode)); + SetOperatingSetting(rideId, RideSetSetting::Mode, static_cast(rideMode)); break; } case WIDX_LOAD_DROPDOWN: - set_operating_setting( + SetOperatingSetting( rideId, RideSetSetting::Departure, (ride->depart_flags & ~RIDE_DEPART_WAIT_FOR_LOAD_MASK) | dropdownIndex); break; } @@ -3398,7 +3397,7 @@ static void WindowRideOperatingUpdate(rct_window* w) WindowEventInvalidateCall(w); WidgetInvalidate(*w, WIDX_TAB_3); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_OPERATING) { ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_OPERATING; @@ -3411,7 +3410,7 @@ static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, if (text == nullptr) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3427,7 +3426,7 @@ static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, { uint32_t origSize = std::stol(std::string(text)) / multiplier; uint8_t size = static_cast(std::clamp(origSize, minValue, maxValue)); - set_operating_setting(ride->id, RideSetSetting::Operation, size); + SetOperatingSetting(ride->id, RideSetSetting::Operation, size); } catch (const std::logic_error&) { @@ -3445,7 +3444,7 @@ static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, uint16_t lowerBound = 0; uint16_t size = std::stol(std::string(text)); size = std::clamp(size, lowerBound, upperBound); - set_operating_setting(ride->id, rideSetSetting, size); + SetOperatingSetting(ride->id, rideSetSetting, size); } catch (const std::logic_error&) { @@ -3472,7 +3471,7 @@ static void WindowRideOperatingInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3707,7 +3706,7 @@ static void WindowRideOperatingPaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowRideDrawTabImages(dpi, w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3739,16 +3738,16 @@ static void WindowRideOperatingPaint(rct_window* w, rct_drawpixelinfo* dpi) */ static void WindowRideLocateMechanic(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; // First check if there is a mechanic assigned - Peep* mechanic = ride_get_assigned_mechanic(*ride); + Peep* mechanic = RideGetAssignedMechanic(*ride); // Otherwise find the closest mechanic if (mechanic == nullptr) - mechanic = ride_find_closest_mechanic(*ride, 1); + mechanic = RideFindClosestMechanic(*ride, 1); if (mechanic == nullptr) ContextShowError(STR_UNABLE_TO_LOCATE_MECHANIC, STR_NONE, {}); @@ -3829,7 +3828,7 @@ static void WindowRideMaintenanceResize(rct_window* w) */ static void WindowRideMaintenanceMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3933,7 +3932,7 @@ static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex if (dropdownIndex == -1) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -3944,7 +3943,7 @@ static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex switch (widgetIndex) { case WIDX_INSPECTION_INTERVAL_DROPDOWN: - set_operating_setting(w->rideId, RideSetSetting::InspectionInterval, dropdownIndex); + SetOperatingSetting(w->rideId, RideSetSetting::InspectionInterval, dropdownIndex); break; case WIDX_FORCE_BREAKDOWN: @@ -4023,7 +4022,7 @@ static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex num_items++; } } - ride_prepare_breakdown(*ride, i); + RidePrepareBreakdown(*ride, i); } break; } @@ -4039,7 +4038,7 @@ static void WindowRideMaintenanceUpdate(rct_window* w) WindowEventInvalidateCall(w); WidgetInvalidate(*w, WIDX_TAB_4); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAINTENANCE) { ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_MAINTENANCE; @@ -4062,7 +4061,7 @@ static void WindowRideMaintenanceInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -4104,7 +4103,7 @@ static void WindowRideMaintenancePaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowRideDrawTabImages(dpi, w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -4311,7 +4310,7 @@ static void WindowRideColourMouseup(rct_window* w, WidgetIndex widgetIndex) ToolSet(*w, WIDX_PAINT_INDIVIDUAL_AREA, Tool::PaintDown); break; case WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX: - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { const bool currentlyEnabled = ride->HasLifecycleFlag(RIDE_LIFECYCLE_RANDOM_SHOP_COLOURS); @@ -4342,7 +4341,7 @@ static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, Wi int32_t i, numItems; StringId stringId; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -4452,15 +4451,15 @@ static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, Wi Dropdown::SetChecked(w->vehicleIndex, true); break; case WIDX_VEHICLE_BODY_COLOUR: - vehicleColour = ride_get_vehicle_colour(*ride, w->vehicleIndex); + vehicleColour = RideGetVehicleColour(*ride, w->vehicleIndex); WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.Body); break; case WIDX_VEHICLE_TRIM_COLOUR: - vehicleColour = ride_get_vehicle_colour(*ride, w->vehicleIndex); + vehicleColour = RideGetVehicleColour(*ride, w->vehicleIndex); WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.Trim); break; case WIDX_VEHICLE_TERNARY_COLOUR: - vehicleColour = ride_get_vehicle_colour(*ride, w->vehicleIndex); + vehicleColour = RideGetVehicleColour(*ride, w->vehicleIndex); WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.Tertiary); break; } @@ -4622,7 +4621,7 @@ static void WindowRideColourInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -4756,7 +4755,7 @@ static void WindowRideColourInvalidate(rct_window* w) if (vehicleColourSchemeType == 0) w->vehicleIndex = 0; - vehicleColour = ride_get_vehicle_colour(*ride, w->vehicleIndex); + vehicleColour = RideGetVehicleColour(*ride, w->vehicleIndex); window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW].type = WindowWidgetType::Scroll; window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::ColourBtn; @@ -4767,7 +4766,7 @@ static void WindowRideColourInvalidate(rct_window* w) for (int32_t i = 0; i < ride->num_cars_per_train; i++) { - uint8_t vehicleTypeIndex = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, i); + uint8_t vehicleTypeIndex = RideEntryGetVehicleAtPosition(ride->subtype, ride->num_cars_per_train, i); if (rideEntry->Cars[vehicleTypeIndex].flags & CAR_ENTRY_FLAG_ENABLE_TRIM_COLOUR) { @@ -4863,7 +4862,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi) // TODO: This should use lists and identified sprites rct_drawpixelinfo clippedDpi; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -4980,7 +4979,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi) */ static void WindowRideColourScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -4989,7 +4988,7 @@ static void WindowRideColourScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i return; auto vehiclePreviewWidget = &window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW]; - auto vehicleColour = ride_get_vehicle_colour(*ride, w->vehicleIndex); + auto vehicleColour = RideGetVehicleColour(*ride, w->vehicleIndex); // Background colour GfxFillRect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } }, PALETTE_INDEX_12); @@ -5001,8 +5000,8 @@ static void WindowRideColourScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i auto trainCarIndex = (ride->colour_scheme_type & 3) == RIDE_COLOUR_SCHEME_MODE_DIFFERENT_PER_CAR ? w->vehicleIndex : rideEntry->TabCar; - CarEntry* carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position( - ride->subtype, ride->num_cars_per_train, trainCarIndex)]; + CarEntry* carEntry = &rideEntry + ->Cars[RideEntryGetVehicleAtPosition(ride->subtype, ride->num_cars_per_train, trainCarIndex)]; screenCoords.y += carEntry->tab_height; @@ -5027,11 +5026,11 @@ static std::vector window_ride_current_music_style_order; */ static void WindowRideToggleMusic(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { int32_t activateMusic = (ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) ? 0 : 1; - set_operating_setting(w->rideId, RideSetSetting::Music, activateMusic); + SetOperatingSetting(w->rideId, RideSetSetting::Music, activateMusic); } } @@ -5093,7 +5092,7 @@ static void WindowRideMusicMousedown(rct_window* w, WidgetIndex widgetIndex, Wid return; auto dropdownWidget = widget - 1; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -5171,7 +5170,7 @@ static void WindowRideMusicDropdown(rct_window* w, WidgetIndex widgetIndex, int3 && static_cast(dropdownIndex) < window_ride_current_music_style_order.size()) { auto musicStyle = window_ride_current_music_style_order[dropdownIndex]; - set_operating_setting(w->rideId, RideSetSetting::MusicType, musicStyle); + SetOperatingSetting(w->rideId, RideSetSetting::MusicType, musicStyle); } } @@ -5201,7 +5200,7 @@ static void WindowRideMusicInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -5293,7 +5292,7 @@ static void SetupScenerySelection(rct_window* w) gTrackDesignSaveRideIndex = w->rideId; - track_design_save_init(); + TrackDesignSaveInit(); gGamePaused |= GAME_PAUSED_SAVING_TRACK; gTrackDesignSaveMode = true; @@ -5314,7 +5313,7 @@ static void SetupScenerySelection(rct_window* w) */ static void WindowRideMeasurementsDesignReset() { - track_design_save_reset_scenery(); + TrackDesignSaveResetScenery(); } /** @@ -5323,7 +5322,7 @@ static void WindowRideMeasurementsDesignReset() */ static void WindowRideMeasurementsDesignSelectNearbyScenery() { - track_design_save_select_nearby_scenery(gTrackDesignSaveRideIndex); + TrackDesignSaveSelectNearbyScenery(gTrackDesignSaveRideIndex); } /** @@ -5342,7 +5341,7 @@ static void TrackDesignCallback(int32_t result, [[maybe_unused]] const utf8* pat { if (result == MODAL_RESULT_OK) { - track_repository_scan(); + TrackRepositoryScan(); } GfxInvalidateScreen(); }; @@ -5355,7 +5354,7 @@ static void WindowRideMeasurementsDesignSave(rct_window* w) { TrackDesignState tds{}; - Ride* ride = get_ride(w->rideId); + Ride* ride = GetRide(w->rideId); _trackDesign = ride->SaveToTrackDesign(tds); if (!_trackDesign) { @@ -5451,7 +5450,7 @@ static void WindowRideMeasurementsMousedown(rct_window* w, WidgetIndex widgetInd if (widgetIndex != WIDX_SAVE_TRACK_DESIGN) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -5521,8 +5520,8 @@ static void WindowRideMeasurementsTooldown(rct_window* w, WidgetIndex widgetInde case ViewportInteractionItem::LargeScenery: case ViewportInteractionItem::Wall: case ViewportInteractionItem::Footpath: - _collectTrackDesignScenery = !track_design_save_contains_tile_element(info.Element); - track_design_save_select_tile_element(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery); + _collectTrackDesignScenery = !TrackDesignSaveContainsTileElement(info.Element); + TrackDesignSaveSelectTileElement(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery); break; default: break; @@ -5546,7 +5545,7 @@ static void WindowRideMeasurementsTooldrag(rct_window* w, WidgetIndex widgetInde case ViewportInteractionItem::LargeScenery: case ViewportInteractionItem::Wall: case ViewportInteractionItem::Footpath: - track_design_save_select_tile_element(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery); + TrackDesignSaveSelectTileElement(info.SpriteType, info.Loc, info.Element, _collectTrackDesignScenery); break; default: break; @@ -5578,7 +5577,7 @@ static void WindowRideMeasurementsInvalidate(rct_window* w) WindowRideSetPressedTab(w); const auto rideId = w->rideId; - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride == nullptr) return; @@ -5640,7 +5639,7 @@ static void WindowRideMeasurementsPaint(rct_window* w, rct_drawpixelinfo* dpi) } else { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -5655,7 +5654,7 @@ static void WindowRideMeasurementsPaint(rct_window* w, rct_drawpixelinfo* dpi) auto ft = Formatter(); ft.Add(ride->excitement); ft.Add(ratingName); - StringId stringId = !ride_has_ratings(*ride) ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE : STR_EXCITEMENT_RATING; + StringId stringId = !RideHasRatings(*ride) ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE : STR_EXCITEMENT_RATING; DrawTextBasic(dpi, screenCoords, stringId, ft); screenCoords.y += LIST_ROW_HEIGHT; @@ -5666,7 +5665,7 @@ static void WindowRideMeasurementsPaint(rct_window* w, rct_drawpixelinfo* dpi) ft.Add(ratingName); stringId = STR_INTENSITY_RATING; - if (!ride_has_ratings(*ride)) + if (!RideHasRatings(*ride)) stringId = STR_INTENSITY_RATING_NOT_YET_AVAILABLE; else if (ride->intensity >= RIDE_RATING(10, 00)) stringId = STR_INTENSITY_RATING_RED; @@ -5679,7 +5678,7 @@ static void WindowRideMeasurementsPaint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(ride->nausea); ft.Add(ratingName); - stringId = !ride_has_ratings(*ride) ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING; + stringId = !RideHasRatings(*ride) ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING; DrawTextBasic(dpi, screenCoords, stringId, ft); screenCoords.y += 2 * LIST_ROW_HEIGHT; @@ -5965,7 +5964,7 @@ static void WindowRideGraphsUpdate(rct_window* w) x = w->scrolls[0].h_left; if (!(w->list_information_type & 0x8000)) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { RideMeasurement* measurement{}; @@ -5990,7 +5989,7 @@ static void WindowRideGraphsScrollgetheight(rct_window* w, int32_t scrollIndex, *width = window_ride_graphs_widgets[WIDX_GRAPH].width() - 2; // Get measurement size - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { RideMeasurement* measurement{}; @@ -6019,7 +6018,7 @@ static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const WidgetIndex w { if (widgetIndex == WIDX_GRAPH) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { auto [measurement, message] = ride->GetMeasurement(); @@ -6057,7 +6056,7 @@ static void WindowRideGraphsInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -6123,7 +6122,7 @@ static void WindowRideGraphsScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i GfxClear(dpi, ColourMapA[COLOUR_SATURATED_GREEN].darker); auto widget = &window_ride_graphs_widgets[WIDX_GRAPH]; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) { return; @@ -6320,7 +6319,7 @@ static void UpdateSamePriceThroughoutFlags(ShopItem shop_item) static void WindowRideIncomeTogglePrimaryPrice(rct_window* w) { const auto rideId = w->rideId; - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride == nullptr) return; @@ -6358,7 +6357,7 @@ static void WindowRideIncomeTogglePrimaryPrice(rct_window* w) static void WindowRideIncomeToggleSecondaryPrice(rct_window* w) { const auto rideId = w->rideId; - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride == nullptr) return; @@ -6391,7 +6390,7 @@ static void WindowRideIncomeIncreasePrimaryPrice(rct_window* w) if (!WindowRideIncomeCanModifyPrimaryPrice(w)) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -6411,7 +6410,7 @@ static void WindowRideIncomeDecreasePrimaryPrice(rct_window* w) if (!WindowRideIncomeCanModifyPrimaryPrice(w)) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -6424,7 +6423,7 @@ static void WindowRideIncomeDecreasePrimaryPrice(rct_window* w) static money64 WindowRideIncomeGetSecondaryPrice(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return 0; @@ -6439,7 +6438,7 @@ static void WindowRideIncomeSetSecondaryPrice(rct_window* w, money16 price) static bool WindowRideIncomeCanModifyPrimaryPrice(rct_window* w) { - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return false; @@ -6505,7 +6504,7 @@ static void WindowRideIncomeMouseup(rct_window* w, WidgetIndex widgetIndex) if (!WindowRideIncomeCanModifyPrimaryPrice(w)) return; - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { MoneyToString(static_cast(ride->price[0]), _moneyInputText, MONEY_STRING_MAXLENGTH, true); @@ -6575,7 +6574,7 @@ static void WindowRideIncomeUpdate(rct_window* w) WindowEventInvalidateCall(w); WidgetInvalidate(*w, WIDX_TAB_9); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_INCOME) { ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_INCOME; @@ -6622,7 +6621,7 @@ static void WindowRideIncomeInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -6657,7 +6656,7 @@ static void WindowRideIncomeInvalidate(rct_window* w) window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Empty; window_ride_income_widgets[WIDX_PRIMARY_PRICE].text = STR_BOTTOM_TOOLBAR_CASH; - money16 ridePrimaryPrice = ride_get_price(*ride); + money16 ridePrimaryPrice = RideGetPrice(*ride); ft.Rewind(); ft.Add(ridePrimaryPrice); if (ridePrimaryPrice == 0) @@ -6668,7 +6667,7 @@ static void WindowRideIncomeInvalidate(rct_window* w) { window_ride_income_widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Checkbox; - if (shop_item_has_common_price(primaryItem)) + if (ShopItemHasCommonPrice(primaryItem)) w->pressed_widgets |= (1uLL << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].text = GetShopItemDescriptor(primaryItem).Naming.PriceLabel; @@ -6698,7 +6697,7 @@ static void WindowRideIncomeInvalidate(rct_window* w) { // Set same price throughout park checkbox w->pressed_widgets &= ~(1uLL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK); - if (shop_item_has_common_price(secondaryItem)) + if (ShopItemHasCommonPrice(secondaryItem)) w->pressed_widgets |= (1uLL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK); // Show widgets @@ -6734,7 +6733,7 @@ static void WindowRideIncomePaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowRideDrawTabImages(dpi, w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -6902,7 +6901,7 @@ static void WindowRideCustomerUpdate(rct_window* w) WindowEventInvalidateCall(w); WidgetInvalidate(*w, WIDX_TAB_10); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr && ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_CUSTOMER) { ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_CUSTOMER; @@ -6925,7 +6924,7 @@ static void WindowRideCustomerInvalidate(rct_window* w) WindowRideSetPressedTab(w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride != nullptr) { auto ft = Formatter::Common(); @@ -6961,7 +6960,7 @@ static void WindowRideCustomerPaint(rct_window* w, rct_drawpixelinfo* dpi) WindowDrawWidgets(*w, dpi); WindowRideDrawTabImages(dpi, w); - auto ride = get_ride(w->rideId); + auto ride = GetRide(w->rideId); if (ride == nullptr) return; @@ -6980,7 +6979,7 @@ static void WindowRideCustomerPaint(rct_window* w, rct_drawpixelinfo* dpi) // Customers per hour auto ft = Formatter(); - ft.Add(ride_customers_per_hour(*ride)); + ft.Add(RideCustomersPerHour(*ride)); DrawTextBasic(dpi, screenCoords, STR_CUSTOMERS_PER_HOUR, ft); screenCoords.y += LIST_ROW_HEIGHT; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index fe4d215d81..39da661e8c 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -201,7 +201,7 @@ private: public: void OnOpen() override { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -242,7 +242,7 @@ public: void OnClose() override { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); ViewportSetVisibility(0); MapInvalidateMapSelectionTiles(); @@ -259,13 +259,13 @@ public: // If we demolish a currentRide all windows will be closed including the construction window, // the currentRide at this point is already gone. - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; } - if (ride_try_get_origin_element(*currentRide, nullptr)) + if (RideTryGetOriginElement(*currentRide, nullptr)) { // Auto open shops if required. if (currentRide->mode == RideMode::ShopStall && gConfigGeneral.AutoOpenShops) @@ -300,7 +300,7 @@ public: { WindowRideConstructionUpdateEnabledTrackPieces(); - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -862,7 +862,7 @@ public: void OnUpdate() override { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -900,7 +900,7 @@ public: if (!WidgetIsActiveTool(*this, WIDX_ENTRANCE) && !WidgetIsActiveTool(*this, WIDX_EXIT)) { _rideConstructionState = gRideEntranceExitPlacePreviousRideConstructionState; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } @@ -931,10 +931,10 @@ public: Close(); break; case WIDX_NEXT_SECTION: - ride_select_next_section(); + RideSelectNextSection(); break; case WIDX_PREVIOUS_SECTION: - ride_select_previous_section(); + RideSelectPreviousSection(); break; case WIDX_CONSTRUCT: Construct(); @@ -955,7 +955,7 @@ public: break; case WIDX_SIMULATE: { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide != nullptr) { auto status = currentRide->status == RideStatus::Simulating ? RideStatus::Closed : RideStatus::Simulating; @@ -969,7 +969,7 @@ public: void OnMouseDown(WidgetIndex widgetIndex) override { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -979,70 +979,70 @@ public: switch (widgetIndex) { case WIDX_LEFT_CURVE: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_LEFT; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_RIGHT_CURVE: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_RIGHT; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_LEFT_CURVE_SMALL: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_LEFT_SMALL; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_RIGHT_CURVE_SMALL: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_RIGHT_SMALL; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_LEFT_CURVE_VERY_SMALL: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_LEFT_VERY_SMALL; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_RIGHT_CURVE_VERY_SMALL: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_RIGHT_VERY_SMALL; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_LEFT_CURVE_LARGE: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_LEFT_LARGE; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_RIGHT_CURVE_LARGE: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackCurve = TRACK_CURVE_RIGHT_LARGE; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_STRAIGHT: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_currentTrackCurve != TRACK_CURVE_NONE) _currentTrackBankEnd = TRACK_BANK_NONE; _currentTrackCurve = TRACK_CURVE_NONE; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_SLOPE_DOWN_STEEP: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (IsTrackEnabled(TRACK_HELIX_SMALL)) { if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT) { _currentTrackCurve = TrackElemType::LeftHalfBankedHelixDownLarge | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT && _currentTrackBankEnd == TRACK_BANK_RIGHT) @@ -1050,14 +1050,14 @@ public: _currentTrackCurve = TrackElemType::RightHalfBankedHelixDownLarge | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_LEFT_SMALL && _currentTrackBankEnd == TRACK_BANK_LEFT) { _currentTrackCurve = TrackElemType::LeftHalfBankedHelixDownSmall | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT_SMALL && _currentTrackBankEnd == TRACK_BANK_RIGHT) @@ -1065,7 +1065,7 @@ public: _currentTrackCurve = TrackElemType::RightHalfBankedHelixDownSmall | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } } @@ -1076,7 +1076,7 @@ public: _currentTrackCurve = TrackElemType::LeftQuarterBankedHelixLargeDown | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT && _currentTrackBankEnd == TRACK_BANK_RIGHT) @@ -1084,7 +1084,7 @@ public: _currentTrackCurve = TrackElemType::RightQuarterBankedHelixLargeDown | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } } @@ -1097,7 +1097,7 @@ public: _currentTrackCurve = TrackElemType::LeftQuarterHelixLargeDown | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT) @@ -1105,7 +1105,7 @@ public: _currentTrackCurve = TrackElemType::RightQuarterHelixLargeDown | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } } @@ -1120,7 +1120,7 @@ public: } break; case WIDX_SLOPE_DOWN: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState == RideConstructionState::Back && _currentTrackBankEnd != TRACK_BANK_NONE) { _currentTrackBankEnd = TRACK_BANK_NONE; @@ -1128,7 +1128,7 @@ public: UpdateLiftHillSelected(TRACK_SLOPE_DOWN_25); break; case WIDX_LEVEL: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState == RideConstructionState::Front && _previousTrackSlopeEnd == 6) { if (_currentTrackCurve == TRACK_CURVE_LEFT_SMALL) @@ -1154,7 +1154,7 @@ public: UpdateLiftHillSelected(TRACK_SLOPE_NONE); break; case WIDX_SLOPE_UP: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState == RideConstructionState::Front && _currentTrackBankEnd != TRACK_BANK_NONE) { _currentTrackBankEnd = TRACK_BANK_NONE; @@ -1164,7 +1164,7 @@ public: if (_rideConstructionState == RideConstructionState::Front && _currentTrackCurve == TRACK_CURVE_NONE) { _currentTrackCurve = TrackElemType::ReverseFreefallSlope | RideConstructionSpecialPieceSelected; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } else @@ -1173,35 +1173,35 @@ public: } break; case WIDX_SLOPE_UP_STEEP: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (IsTrackEnabled(TRACK_HELIX_SMALL)) { if (_currentTrackCurve == TRACK_CURVE_LEFT && _currentTrackBankEnd == TRACK_BANK_LEFT) { _currentTrackCurve = TrackElemType::LeftHalfBankedHelixUpLarge | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT && _currentTrackBankEnd == TRACK_BANK_RIGHT) { _currentTrackCurve = TrackElemType::RightHalfBankedHelixUpLarge | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_LEFT_SMALL && _currentTrackBankEnd == TRACK_BANK_LEFT) { _currentTrackCurve = TrackElemType::LeftHalfBankedHelixUpSmall | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT_SMALL && _currentTrackBankEnd == TRACK_BANK_RIGHT) { _currentTrackCurve = TrackElemType::RightHalfBankedHelixUpSmall | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } } @@ -1212,7 +1212,7 @@ public: _currentTrackCurve = TrackElemType::LeftQuarterBankedHelixLargeUp | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT && _currentTrackBankEnd == TRACK_BANK_RIGHT) @@ -1220,7 +1220,7 @@ public: _currentTrackCurve = TrackElemType::RightQuarterBankedHelixLargeUp | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } } @@ -1232,14 +1232,14 @@ public: { _currentTrackCurve = TrackElemType::LeftQuarterHelixLargeUp | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } if (_currentTrackCurve == TRACK_CURVE_RIGHT) { _currentTrackCurve = TrackElemType::RightQuarterHelixLargeUp | RideConstructionSpecialPieceSelected; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; } } @@ -1254,29 +1254,29 @@ public: } break; case WIDX_CHAIN_LIFT: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackLiftHill ^= CONSTRUCTION_LIFT_HILL_SELECTED; if ((_currentTrackLiftHill & CONSTRUCTION_LIFT_HILL_SELECTED) && !gCheatsEnableChainLiftOnAllTrack) _currentTrackAlternative &= ~RIDE_TYPE_ALTERNATIVE_TRACK_PIECES; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_BANK_LEFT: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (!_currentlyShowingBrakeOrBoosterSpeed) { _currentTrackBankEnd = TRACK_BANK_LEFT; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } break; case WIDX_BANK_STRAIGHT: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (!_currentlyShowingBrakeOrBoosterSpeed) { _currentTrackBankEnd = TRACK_BANK_NONE; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } else { @@ -1292,18 +1292,18 @@ public: else { *brakesSpeedPtr = brakesSpeed; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } } break; case WIDX_BANK_RIGHT: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (!_currentlyShowingBrakeOrBoosterSpeed) { _currentTrackBankEnd = TRACK_BANK_RIGHT; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } else { @@ -1318,7 +1318,7 @@ public: else { *brakesSpeedPtr = brakesSpeed; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } } @@ -1327,18 +1327,18 @@ public: ShowSpecialTrackDropdown(&widgets[widgetIndex]); break; case WIDX_U_TRACK: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackAlternative &= ~RIDE_TYPE_ALTERNATIVE_TRACK_PIECES; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_O_TRACK: - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackAlternative |= RIDE_TYPE_ALTERNATIVE_TRACK_PIECES; if (!gCheatsEnableChainLiftOnAllTrack) _currentTrackLiftHill &= ~CONSTRUCTION_LIFT_HILL_SELECTED; _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); break; case WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP: if (_currentSeatRotationAngle < 15) @@ -1350,7 +1350,7 @@ public: else { _currentSeatRotationAngle++; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } break; @@ -1364,7 +1364,7 @@ public: else { _currentSeatRotationAngle--; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } break; @@ -1378,7 +1378,7 @@ public: if (selectedIndex == -1) return; - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackPrice = MONEY32_UNDEFINED; track_type_t trackPiece = _currentPossibleRideConfigurations[selectedIndex]; switch (trackPiece) @@ -1395,7 +1395,7 @@ public: break; } _currentTrackCurve = trackPiece | RideConstructionSpecialPieceSelected; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } void OnToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) override @@ -1428,7 +1428,7 @@ public: void OnPrepareDraw() override { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -1454,7 +1454,7 @@ public: if (_selectedTrackType == TrackElemType::Booster || _currentTrackCurve == (RideConstructionSpecialPieceSelected | TrackElemType::Booster)) { - brakeSpeed2 = get_booster_speed(currentRide->type, brakeSpeed2); + brakeSpeed2 = GetBoosterSpeed(currentRide->type, brakeSpeed2); } ft.Add(brakeSpeed2); } @@ -1526,7 +1526,7 @@ public: void UpdateWidgets() { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -2057,7 +2057,7 @@ public: void UpdatePossibleRideConfigurations() { int32_t trackType; - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -2176,7 +2176,7 @@ public: break; } - if (get_ride(_currentRideIndex)) + if (GetRide(_currentRideIndex)) { SelectMapTiles(trackType, trackDirection, trackPos); MapInvalidateMapSelectionTiles(); @@ -2223,15 +2223,15 @@ private: _currentTrackPrice = MONEY32_UNDEFINED; _trackPlaceCost = MONEY32_UNDEFINED; _trackPlaceErrorMessage = STR_NONE; - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (WindowRideConstructionUpdateState( &trackType, &trackDirection, &rideIndex, &liftHillAndAlternativeState, &trackPos, &properties)) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide == nullptr) { return; @@ -2294,24 +2294,24 @@ private: track_begin_end trackBeginEnd; _currentTrackPrice = MONEY32_UNDEFINED; - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); // Select the track element that is to be deleted _rideConstructionState2 = RideConstructionState::Selected; if (_rideConstructionState == RideConstructionState::Front) { - if (!ride_select_backwards_from_front()) + if (!RideSelectBackwardsFromFront()) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } _rideConstructionState2 = RideConstructionState::Front; } else if (_rideConstructionState == RideConstructionState::Back) { - if (!ride_select_forwards_from_back()) + if (!RideSelectForwardsFromBack()) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } _rideConstructionState2 = RideConstructionState::Back; @@ -2326,7 +2326,7 @@ private: { _currentTrackBegin, static_cast(direction & 3) }, type, 0, &tileElement, 0); if (!newCoords.has_value()) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } @@ -2334,14 +2334,14 @@ private: inputElement.x = newCoords->x; inputElement.y = newCoords->y; inputElement.element = tileElement; - if (track_block_get_previous({ *newCoords, tileElement }, &trackBeginEnd)) + if (TrackBlockGetPrevious({ *newCoords, tileElement }, &trackBeginEnd)) { *newCoords = { trackBeginEnd.begin_x, trackBeginEnd.begin_y, trackBeginEnd.begin_z }; direction = trackBeginEnd.begin_direction; type = trackBeginEnd.begin_element->AsTrack()->GetTrackType(); _gotoStartPlacementMode = false; } - else if (track_block_get_next(&inputElement, &outputElement, &newCoords->z, &direction)) + else if (TrackBlockGetNext(&inputElement, &outputElement, &newCoords->z, &direction)) { newCoords->x = outputElement.x; newCoords->y = outputElement.y; @@ -2358,7 +2358,7 @@ private: if (!newCoords.has_value()) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } @@ -2368,11 +2368,11 @@ private: _gotoStartPlacementMode = true; // When flat rides are deleted, the window should be reset so the currentRide can be placed again. - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); const auto& rtd = currentRide->GetRideTypeDescriptor(); if (rtd.HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE) && !rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) { - ride_initialise_construction_window(*currentRide); + RideInitialiseConstructionWindow(*currentRide); } } @@ -2382,11 +2382,11 @@ private: trackRemoveAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) { if (result->Error != GameActions::Status::Ok) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } else { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide != nullptr) { window_ride_construction_mouseup_demolish_next_piece( @@ -2402,19 +2402,19 @@ private: { _autoRotatingShop = false; _currentTrackPieceDirection = (_currentTrackPieceDirection + 1) & 3; - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackPrice = MONEY32_UNDEFINED; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } void EntranceClick() { if (ToolSet(*this, WIDX_ENTRANCE, Tool::Crosshair)) { - auto currentRide = get_ride(_currentRideIndex); - if (currentRide != nullptr && !ride_try_get_origin_element(*currentRide, nullptr)) + auto currentRide = GetRide(_currentRideIndex); + if (currentRide != nullptr && !RideTryGetOriginElement(*currentRide, nullptr)) { - ride_initialise_construction_window(*currentRide); + RideInitialiseConstructionWindow(*currentRide); } } else @@ -2423,13 +2423,13 @@ private: gRideEntranceExitPlaceRideIndex = _currentRideIndex; gRideEntranceExitPlaceStationIndex = StationIndex::FromUnderlying(0); input_set_flag(INPUT_FLAG_6, true); - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState != RideConstructionState::EntranceExit) { gRideEntranceExitPlacePreviousRideConstructionState = _rideConstructionState; _rideConstructionState = RideConstructionState::EntranceExit; } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } @@ -2437,10 +2437,10 @@ private: { if (ToolSet(*this, WIDX_EXIT, Tool::Crosshair)) { - auto currentRide = get_ride(_currentRideIndex); - if (!ride_try_get_origin_element(*currentRide, nullptr)) + auto currentRide = GetRide(_currentRideIndex); + if (!RideTryGetOriginElement(*currentRide, nullptr)) { - ride_initialise_construction_window(*currentRide); + RideInitialiseConstructionWindow(*currentRide); } } else @@ -2449,13 +2449,13 @@ private: gRideEntranceExitPlaceRideIndex = _currentRideIndex; gRideEntranceExitPlaceStationIndex = StationIndex::FromUnderlying(0); input_set_flag(INPUT_FLAG_6, true); - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState != RideConstructionState::EntranceExit) { gRideEntranceExitPlacePreviousRideConstructionState = _rideConstructionState; _rideConstructionState = RideConstructionState::EntranceExit; } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } @@ -2476,7 +2476,7 @@ private: break; } } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } void SetBrakeSpeed(int32_t brakesSpeed) @@ -2490,13 +2490,12 @@ private: { auto trackSetBrakeSpeed = TrackSetBrakeSpeedAction( _currentTrackBegin, tileElement->AsTrack()->GetTrackType(), brakesSpeed); - trackSetBrakeSpeed.SetCallback([](const GameAction* ga, const GameActions::Result* result) { - window_ride_construction_update_active_elements(); - }); + trackSetBrakeSpeed.SetCallback( + [](const GameAction* ga, const GameActions::Result* result) { WindowRideConstructionUpdateActiveElements(); }); GameActions::Execute(&trackSetBrakeSpeed); return; } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } void ShowSpecialTrackDropdown(Widget* widget) @@ -2510,7 +2509,7 @@ private: StringId trackPieceStringId = ted.Description; if (trackPieceStringId == STR_RAPIDS) { - auto currentRide = get_ride(_currentRideIndex); + auto currentRide = GetRide(_currentRideIndex); if (currentRide != nullptr) { const auto& rtd = currentRide->GetRideTypeDescriptor(); @@ -2544,17 +2543,17 @@ private: GetTrackElementOriginAndApplyChanges( { _currentTrackBegin, static_cast(_currentTrackPieceDirection & 3) }, _currentTrackPieceType, seatRotation, nullptr, TRACK_ELEMENT_SET_SEAT_ROTATION); - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } void ToolDownEntranceExit(const ScreenCoordsXY& screenCoords) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); MapInvalidateSelectionRect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - CoordsXYZD entranceOrExitCoords = ride_get_entrance_or_exit_position_from_screen_position(screenCoords); + CoordsXYZD entranceOrExitCoords = RideGetEntranceOrExitPositionFromScreenPosition(screenCoords); if (gRideEntranceExitPlaceDirection == INVALID_DIRECTION) return; @@ -2568,8 +2567,8 @@ private: OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position); - auto currentRide = get_ride(gRideEntranceExitPlaceRideIndex); - if (currentRide != nullptr && ride_are_all_possible_entrances_and_exits_built(*currentRide).Successful) + auto currentRide = GetRide(gRideEntranceExitPlaceRideIndex); + if (currentRide != nullptr && RideAreAllPossibleEntrancesAndExitsBuilt(*currentRide).Successful) { ToolCancel(); if (currentRide->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_NO_TRACK)) @@ -2593,7 +2592,7 @@ private: rct_drawpixelinfo* dpi, RideId rideIndex, int32_t trackType, int32_t trackDirection, int32_t liftHillAndInvertedState, int32_t widgetWidth, int32_t widgetHeight) { - auto currentRide = get_ride(rideIndex); + auto currentRide = GetRide(rideIndex); if (currentRide == nullptr) { return; @@ -2638,7 +2637,7 @@ private: PaintSession* session = PaintSessionAlloc(dpi, 0); trackDirection &= 3; - auto currentRide = get_ride(rideIndex); + auto currentRide = GetRide(rideIndex); if (currentRide == nullptr) { return; @@ -2751,7 +2750,7 @@ static void WindowRideConstructionUpdateDisabledPieces(ObjectEntryIndex rideType } // Any pieces that this ride entry supports must be taken out of the array. - auto supportedPieces = ride_entry_get_supported_track_pieces(*currentRideEntry); + auto supportedPieces = RideEntryGetSupportedTrackPieces(*currentRideEntry); disabledPieces &= supportedPieces.flip(); } } @@ -2768,7 +2767,7 @@ rct_window* WindowRideConstructionOpen() RideId rideIndex = _currentRideIndex; CloseRideWindowForConstruction(rideIndex); - auto currentRide = get_ride(rideIndex); + auto currentRide = GetRide(rideIndex); if (currentRide == nullptr) { return nullptr; @@ -2795,7 +2794,7 @@ static void CloseConstructWindowOnCompletion(const Ride& ride) auto w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr) { - if (ride_are_all_possible_entrances_and_exits_built(ride).Successful) + if (RideAreAllPossibleEntrancesAndExitsBuilt(ride).Successful) { WindowClose(*w); } @@ -2810,7 +2809,7 @@ static void CloseConstructWindowOnCompletion(const Ride& ride) static void window_ride_construction_do_entrance_exit_check() { auto w = WindowFindByClass(WindowClass::RideConstruction); - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (w == nullptr || ride == nullptr) { return; @@ -2821,7 +2820,7 @@ static void window_ride_construction_do_entrance_exit_check() w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr) { - if (!ride_are_all_possible_entrances_and_exits_built(*ride).Successful) + if (!RideAreAllPossibleEntrancesAndExitsBuilt(*ride).Successful) { WindowEventMouseUpCall(w, WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE); } @@ -2833,10 +2832,10 @@ static void RideConstructPlacedForwardGameActionCallback(const GameAction* ga, c { if (result->Error != GameActions::Status::Ok) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride != nullptr) { int32_t trackDirection = _currentTrackPieceDirection; @@ -2847,7 +2846,7 @@ static void RideConstructPlacedForwardGameActionCallback(const GameAction* ga, c } CoordsXYE next_track; - if (track_block_get_next_from_zero(trackPos, *ride, trackDirection, &next_track, &trackPos.z, &trackDirection, false)) + if (TrackBlockGetNextFromZero(trackPos, *ride, trackDirection, &next_track, &trackPos.z, &trackDirection, false)) { _currentTrackBegin.x = next_track.x; _currentTrackBegin.y = next_track.y; @@ -2858,7 +2857,7 @@ static void RideConstructPlacedForwardGameActionCallback(const GameAction* ga, c _rideConstructionState = RideConstructionState::Selected; _rideConstructionNextArrowPulse = 0; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - ride_select_next_section(); + RideSelectNextSection(); } else { @@ -2866,7 +2865,7 @@ static void RideConstructPlacedForwardGameActionCallback(const GameAction* ga, c } window_ride_construction_do_entrance_exit_check(); - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } WindowCloseByClass(WindowClass::Error); @@ -2878,10 +2877,10 @@ static void RideConstructPlacedBackwardGameActionCallback(const GameAction* ga, { if (result->Error != GameActions::Status::Ok) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride != nullptr) { auto trackDirection = DirectionReverse(_currentTrackPieceDirection); @@ -2892,7 +2891,7 @@ static void RideConstructPlacedBackwardGameActionCallback(const GameAction* ga, } track_begin_end trackBeginEnd; - if (track_block_get_previous_from_zero(trackPos, *ride, trackDirection, &trackBeginEnd)) + if (TrackBlockGetPreviousFromZero(trackPos, *ride, trackDirection, &trackBeginEnd)) { _currentTrackBegin.x = trackBeginEnd.begin_x; _currentTrackBegin.y = trackBeginEnd.begin_y; @@ -2903,14 +2902,14 @@ static void RideConstructPlacedBackwardGameActionCallback(const GameAction* ga, _rideConstructionState = RideConstructionState::Selected; _rideConstructionNextArrowPulse = 0; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - ride_select_previous_section(); + RideSelectPreviousSection(); } else { _rideConstructionState = RideConstructionState::State0; } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } WindowCloseByClass(WindowClass::Error); @@ -3032,7 +3031,7 @@ static std::optional RideGetPlacePositionFromScreenPosition(ScreenCoor void WindowRideConstructionUpdateActiveElementsImpl() { WindowRideConstructionUpdateEnabledTrackPieces(); - if (auto currentRide = get_ride(_currentRideIndex); + if (auto currentRide = GetRide(_currentRideIndex); !currentRide || currentRide->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_MAZE)) { return; @@ -3072,7 +3071,7 @@ void WindowRideConstructionUpdateActiveElementsImpl() */ void WindowRideConstructionUpdateEnabledTrackPieces() { - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride == nullptr) return; @@ -3103,7 +3102,7 @@ void UpdateGhostTrackAndArrow() // Set by footpath placement if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_RECHECK) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); _currentTrackSelectionFlags &= ~TRACK_SELECTION_FLAG_RECHECK; } @@ -3118,13 +3117,13 @@ void UpdateGhostTrackAndArrow() if (WindowRideConstructionUpdateState( &type, &direction, &rideIndex, &liftHillAndAlternativeState, &trackPos, nullptr)) { - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); } else { _currentTrackPrice = PlaceProvisionalTrackPiece( rideIndex, type, direction, liftHillAndAlternativeState, trackPos); - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } // update flashing arrow @@ -3166,7 +3165,7 @@ void UpdateGhostTrackAndArrow() { _currentTrackBegin, static_cast(direction) }, type, 0, nullptr, flags); if (!newCoords.has_value()) { - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); _rideConstructionState = RideConstructionState::State0; } break; @@ -3221,7 +3220,7 @@ void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords) auto mapCoords = RideGetPlacePositionFromScreenPosition(screenCoords); if (!mapCoords) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); MapInvalidateMapSelectionTiles(); return; } @@ -3243,12 +3242,12 @@ void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords) if (WindowRideConstructionUpdateState( &trackType, &trackDirection, &rideIndex, &liftHillAndAlternativeState, nullptr, nullptr)) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); MapInvalidateMapSelectionTiles(); return; } _currentTrackPieceType = trackType; - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (!ride) { return; @@ -3424,7 +3423,7 @@ void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords) } } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); MapInvalidateMapSelectionTiles(); } @@ -3439,10 +3438,10 @@ void RideConstructionToolupdateEntranceExit(const ScreenCoordsXY& screenCoords) gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - CoordsXYZD entranceOrExitCoords = ride_get_entrance_or_exit_position_from_screen_position(screenCoords); + CoordsXYZD entranceOrExitCoords = RideGetEntranceOrExitPositionFromScreenPosition(screenCoords); if (gRideEntranceExitPlaceDirection == INVALID_DIRECTION) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); return; } gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE; @@ -3459,13 +3458,13 @@ void RideConstructionToolupdateEntranceExit(const ScreenCoordsXY& screenCoords) if (!(_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ENTRANCE_OR_EXIT) || entranceOrExitCoords != gRideEntranceExitGhostPosition || stationNum != gRideEntranceExitGhostStationIndex) { - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride != nullptr) { _currentTrackPrice = RideEntranceExitPlaceGhost( *ride, entranceOrExitCoords, entranceOrExitCoords.direction, gRideEntranceExitPlaceType, stationNum); } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } @@ -3480,7 +3479,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords) rct_window* w; MapInvalidateMapSelectionTiles(); - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); CoordsXYZ mapCoords{}; int32_t trackType, z, highestZ; @@ -3521,7 +3520,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords) ToolCancel(); - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride == nullptr) return; @@ -3627,7 +3626,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords) _currentTrackBegin.y = mapCoords.y; _currentTrackBegin.z = z; _currentTrackSelectionFlags = 0; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); w = WindowFindByClass(WindowClass::RideConstruction); if (w == nullptr) break; @@ -3655,7 +3654,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords) int32_t saveCurrentTrackAlternative = _currentTrackAlternative; int32_t saveCurrentTrackLiftHill = _currentTrackLiftHill; - ride_initialise_construction_window(*ride); + RideInitialiseConstructionWindow(*ride); _currentTrackPieceDirection = saveTrackDirection; _currentTrackCurve = saveCurrentTrackCurve; @@ -4561,12 +4560,12 @@ static void window_ride_construction_mouseup_demolish_next_piece(const CoordsXYZ int32_t savedCurrentTrackBankEnd = _currentTrackBankEnd; int32_t savedCurrentTrackAlternative = _currentTrackAlternative; int32_t savedCurrentTrackLiftHill = _currentTrackLiftHill; - ride_construction_set_default_next_piece(); - window_ride_construction_update_active_elements(); - auto ride = get_ride(_currentRideIndex); - if (!ride_try_get_origin_element(*ride, nullptr)) + RideConstructionSetDefaultNextPiece(); + WindowRideConstructionUpdateActiveElements(); + auto ride = GetRide(_currentRideIndex); + if (!RideTryGetOriginElement(*ride, nullptr)) { - ride_initialise_construction_window(*ride); + RideInitialiseConstructionWindow(*ride); _currentTrackPieceDirection = piecePos.direction & 3; if (!(savedCurrentTrackCurve & RideConstructionSpecialPieceSelected)) { @@ -4577,7 +4576,7 @@ static void window_ride_construction_mouseup_demolish_next_piece(const CoordsXYZ _currentTrackBankEnd = savedCurrentTrackBankEnd; _currentTrackAlternative = savedCurrentTrackAlternative; _currentTrackLiftHill = savedCurrentTrackLiftHill; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } } @@ -4609,12 +4608,12 @@ static void window_ride_construction_mouseup_demolish_next_piece(const CoordsXYZ _currentTrackSelectionFlags = 0; if (_rideConstructionState2 == RideConstructionState::Front) { - ride_select_next_section(); + RideSelectNextSection(); } else if (_rideConstructionState2 == RideConstructionState::Back) { - ride_select_previous_section(); + RideSelectPreviousSection(); } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index db7c38b5fc..e5d297d1ce 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -540,7 +540,7 @@ public: } // Get ride - const auto* ridePtr = get_ride(_rideList[i]); + const auto* ridePtr = GetRide(_rideList[i]); if (ridePtr == nullptr) continue; @@ -606,7 +606,7 @@ public: break; case INFORMATION_TYPE_CUSTOMERS: formatSecondary = STR_RIDE_LIST_CUSTOMERS_PER_HOUR_LABEL; - ft.Add(ride_customers_per_hour(*ridePtr)); + ft.Add(RideCustomersPerHour(*ridePtr)); break; case INFORMATION_TYPE_AGE: { @@ -695,7 +695,7 @@ public: break; case INFORMATION_TYPE_EXCITEMENT: formatSecondary = STR_RATING_UKNOWN_LABEL; - if (ride_has_ratings(*ridePtr)) + if (RideHasRatings(*ridePtr)) { formatSecondary = STR_EXCITEMENT_LABEL; ft.Add(ridePtr->excitement); @@ -703,7 +703,7 @@ public: break; case INFORMATION_TYPE_INTENSITY: formatSecondary = STR_RATING_UKNOWN_LABEL; - if (ride_has_ratings(*ridePtr)) + if (RideHasRatings(*ridePtr)) { formatSecondary = STR_INTENSITY_LABEL; ft.Add(ridePtr->intensity); @@ -711,7 +711,7 @@ public: break; case INFORMATION_TYPE_NAUSEA: formatSecondary = STR_RATING_UKNOWN_LABEL; - if (ride_has_ratings(*ridePtr)) + if (RideHasRatings(*ridePtr)) { formatSecondary = STR_NAUSEA_LABEL; ft.Add(ridePtr->nausea); @@ -773,7 +773,7 @@ private: { while (--currentListPosition >= 0) { - const auto* otherRide = get_ride(_rideList[currentListPosition]); + const auto* otherRide = GetRide(_rideList[currentListPosition]); if (otherRide != nullptr) { if (pred(thisRide, *otherRide)) @@ -795,7 +795,7 @@ private: for (auto& rideRef : GetRideManager()) { if (rideRef.GetClassification() != static_cast(page) - || (rideRef.status == RideStatus::Closed && !ride_has_any_track_elements(rideRef))) + || (rideRef.status == RideStatus::Closed && !RideHasAnyTrackElements(rideRef))) continue; if (rideRef.window_invalidate_flags & RIDE_INVALIDATE_RIDE_LIST) @@ -846,7 +846,7 @@ private: case INFORMATION_TYPE_CUSTOMERS: currentListPosition = SortList( currentListPosition, rideRef, [](const Ride& thisRide, const Ride& otherRide) -> bool { - return ride_customers_per_hour(thisRide) <= ride_customers_per_hour(otherRide); + return RideCustomersPerHour(thisRide) <= RideCustomersPerHour(otherRide); }); break; case INFORMATION_TYPE_AGE: diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index af0a752087..dad2766f2f 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -1183,7 +1183,7 @@ public: { auto trackElement = tileElement->AsTrack(); RideId id = trackElement->GetRideIndex(); - auto rideTile = get_ride(id); + auto rideTile = GetRide(id); // Ride ID auto ft = Formatter(); diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 81a3126ee9..8f27470ee9 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -157,7 +157,7 @@ void TrackDesignManageWindow::OnTextInput(WidgetIndex widgetIndex, std::string_v return; } - if (track_repository_rename(_trackDesignFileReference->path, std::string(text))) + if (TrackRepositoryRename(_trackDesignFileReference->path, std::string(text))) { WindowCloseByClass(WindowClass::TrackDeletePrompt); Close(); @@ -210,7 +210,7 @@ void TrackDeletePromptWindow::OnMouseUp(WidgetIndex widgetIndex) // tdPath has to be saved before window is closed, as that would blank it out. auto tdPath = _trackDesignFileReference->path; Close(); - if (track_repository_delete(tdPath)) + if (TrackRepositoryDelete(tdPath)) { WindowCloseByClass(WindowClass::ManageTrackDesign); WindowTrackDesignListReloadTracks(); diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 79fe7c68ad..b7e777609a 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -230,14 +230,14 @@ public: if (result->Error == GameActions::Status::Ok) { rideId = result->GetData(); - auto getRide = get_ride(rideId); + auto getRide = GetRide(rideId); if (getRide != nullptr) { WindowCloseByClass(WindowClass::Error); OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, trackLoc); _currentRideIndex = rideId; - if (track_design_are_entrance_and_exit_placed()) + if (TrackDesignAreEntranceAndExitPlaced()) { auto intent = Intent(WindowClass::Ride); intent.putExtra(INTENT_EXTRA_RIDE_ID, rideId.ToUnderlying()); @@ -247,7 +247,7 @@ public: } else { - ride_initialise_construction_window(*getRide); + RideInitialiseConstructionWindow(*getRide); auto wnd = WindowFindByClass(WindowClass::RideConstruction); WindowEventMouseUpCall(wnd, WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE); } @@ -316,7 +316,7 @@ public: { if (_hasPlacementGhost) { - auto provRide = get_ride(_placementGhostRideId); + auto provRide = GetRide(_placementGhostRideId); if (provRide != nullptr) { TrackDesignPreviewRemoveGhosts(_trackDesign.get(), *provRide, _placementGhostLoc); @@ -392,7 +392,7 @@ private: { if (_hasPlacementGhost) { - auto newRide = get_ride(_placementGhostRideId); + auto newRide = GetRide(_placementGhostRideId); if (newRide != nullptr) { TrackDesignPreviewRemoveGhosts(_trackDesign.get(), *newRide, _placementGhostLoc); diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index ea2c10cfba..d2559cd37c 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -179,7 +179,7 @@ private: { if (GetRideTypeDescriptor(item.Type).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { - entryName = get_ride_entry_name(item.EntryIndex); + entryName = GetRideEntryName(item.EntryIndex); } } _trackDesigns = repo->GetItemsForObjectEntry(item.Type, entryName); @@ -366,7 +366,7 @@ public: if (entry != nullptr) { - RideNaming rideName = get_ride_naming(_window_track_list_item.Type, *entry); + RideNaming rideName = GetRideNaming(_window_track_list_item.Type, *entry); stringId = rideName.Name; } diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 945a8169e4..4fa3043c46 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -297,7 +297,7 @@ namespace Editor MapRemoveAllRides(); UnlinkAllRideBanners(); - ride_init_all(); + RideInitAll(); // for (auto* guest : EntityList()) diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index b9eda3e41a..a25cf5d835 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -371,7 +371,7 @@ void game_fix_save_vars() { continue; } - Ride* ride = get_ride(rideIdx); + Ride* ride = GetRide(rideIdx); if (ride == nullptr) { log_warning("Couldn't find ride %u, resetting ride on peep %u", rideIdx, peep->sprite_index); @@ -382,7 +382,7 @@ void game_fix_save_vars() log_warning( "Peep %u (%s) has invalid ride station = %u for ride %u.", peep->sprite_index, curName.c_str(), srcStation.ToUnderlying(), rideIdx); - auto station = ride_get_first_valid_station_exit(*ride); + auto station = RideGetFirstValidStationExit(*ride); if (station.IsNull()) { log_warning("Couldn't find station, removing peep %u", peep->sprite_index); @@ -447,7 +447,7 @@ void game_fix_save_vars() BannerFixDuplicates(); // Fix invalid vehicle sprite sizes, thus preventing visual corruption of sprites - fix_invalid_vehicle_sprite_sizes(); + FixInvalidVehicleSpriteSizes(); // Fix gParkEntrance locations for which the tile_element no longer exists ParkEntranceFixLocations(); diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 0ccaef36fd..4d275ec2da 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -67,7 +67,7 @@ void GameState::InitAll(const TileCoordsXY& mapSize) _park->Initialise(); finance_init(); BannerInit(); - ride_init_all(); + RideInitAll(); ResetAllEntities(); UpdateConsolidatedPatrolAreas(); DateReset(); @@ -332,7 +332,7 @@ void GameState::UpdateLogic(LogicTimings* timings) report_time(LogicTimePart::Peep); MapRestoreProvisionalElements(); report_time(LogicTimePart::MapRestoreProvisionalElements); - vehicle_update_all(); + VehicleUpdateAll(); report_time(LogicTimePart::Vehicle); UpdateAllMiscEntities(); report_time(LogicTimePart::Misc); @@ -347,16 +347,16 @@ void GameState::UpdateLogic(LogicTimings* timings) research_update(); report_time(LogicTimePart::Research); - ride_ratings_update_all(); + RideRatingsUpdateAll(); report_time(LogicTimePart::RideRatings); - ride_measurements_update(); + RideMeasurementsUpdate(); report_time(LogicTimePart::RideMeasurments); News::UpdateCurrentItem(); report_time(LogicTimePart::News); MapAnimationInvalidateAll(); report_time(LogicTimePart::MapAnimation); - vehicle_sounds_update(); + VehicleSoundsUpdate(); peep_update_crowd_noise(); ClimateUpdateSound(); report_time(LogicTimePart::Sounds); diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index fef4678ff0..e1dde80751 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -535,7 +535,7 @@ namespace OpenRCT2 SerialiseParkParameters(parkParamsDs); game_load_init(); - fix_invalid_vehicle_sprite_sizes(); + FixInvalidVehicleSpriteSizes(); } catch (const std::exception& ex) { diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index 7fe97d9a45..0f316477c5 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -450,13 +450,13 @@ void CheatSetAction::FixBrokenRides() const if ((ride.mechanic_status != RIDE_MECHANIC_STATUS_FIXING) && (ride.lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN))) { - auto mechanic = ride_get_assigned_mechanic(ride); + auto mechanic = RideGetAssignedMechanic(ride); if (mechanic != nullptr) { mechanic->RemoveFromRide(); } - ride_fix_breakdown(ride, 0); + RideFixBreakdown(ride, 0); ride.window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST; } } diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index 7233d1cb79..bfbe267ac0 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -274,7 +274,7 @@ StringId LandSetHeightAction::CheckRideSupports() const { RideId rideIndex = trackElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) continue; diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index 9528322554..627faaf470 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -79,7 +79,7 @@ GameActions::Result MazePlaceTrackAction::Query() const { heightDifference /= COORDS_Z_PER_TINY_Z; - auto* ride = get_ride(_rideIndex); + auto* ride = GetRide(_rideIndex); const auto& rtd = ride->GetRideTypeDescriptor(); if (heightDifference > rtd.Heights.MaxHeight) { @@ -112,7 +112,7 @@ GameActions::Result MazePlaceTrackAction::Query() const return res; } - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr || ride->type == RIDE_TYPE_NULL) { res.Error = GameActions::Status::InvalidParameters; @@ -133,7 +133,7 @@ GameActions::Result MazePlaceTrackAction::Execute() const res.Expenditure = ExpenditureType::RideConstruction; res.ErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { res.Error = GameActions::Status::InvalidParameters; diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index 387e5dcf61..ca781f4b0a 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -90,7 +90,7 @@ GameActions::Result MazeSetTrackAction::Query() const { heightDifference /= COORDS_Z_PER_TINY_Z; - auto* ride = get_ride(_rideIndex); + auto* ride = GetRide(_rideIndex); const auto& rtd = ride->GetRideTypeDescriptor(); if (heightDifference > rtd.Heights.MaxHeight) { @@ -131,7 +131,7 @@ GameActions::Result MazeSetTrackAction::Query() const return res; } - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr || ride->type == RIDE_CRASH_TYPE_NONE) { res.Error = GameActions::Status::NoClearance; @@ -155,7 +155,7 @@ GameActions::Result MazeSetTrackAction::Execute() const res.Expenditure = ExpenditureType::RideConstruction; res.ErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { res.Error = GameActions::Status::InvalidParameters; diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 9afac2767e..263cebf06c 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -84,7 +84,7 @@ GameActions::Result RideCreateAction::Query() const GameActions::Status::InvalidParameters, STR_CANT_CREATE_NEW_RIDE_ATTRACTION, STR_INVALID_RIDE_TYPE); } - int32_t rideEntryIndex = ride_get_entry_index(_rideType, _subType); + int32_t rideEntryIndex = RideGetEntryIndex(_rideType, _subType); if (rideEntryIndex >= MAX_RIDE_OBJECTS) { return GameActions::Result( @@ -120,7 +120,7 @@ GameActions::Result RideCreateAction::Execute() const rct_ride_entry* rideEntry; auto res = GameActions::Result(); - int32_t rideEntryIndex = ride_get_entry_index(_rideType, _subType); + int32_t rideEntryIndex = RideGetEntryIndex(_rideType, _subType); auto rideIndex = GetNextFreeRideId(); auto ride = GetOrAllocateRide(rideIndex); @@ -237,9 +237,9 @@ GameActions::Result RideCreateAction::Execute() const if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_TOILET)) { - if (shop_item_has_common_price(ShopItem::Admission)) + if (ShopItemHasCommonPrice(ShopItem::Admission)) { - money32 price = ride_get_common_price(*ride); + money32 price = RideGetCommonPrice(*ride); if (price != MONEY32_UNDEFINED) { ride->price[0] = static_cast(price); @@ -251,9 +251,9 @@ GameActions::Result RideCreateAction::Execute() const { if (rideEntry->shop_item[i] != ShopItem::None) { - if (shop_item_has_common_price(rideEntry->shop_item[i])) + if (ShopItemHasCommonPrice(rideEntry->shop_item[i])) { - money32 price = shop_item_get_common_price(ride, rideEntry->shop_item[i]); + money32 price = ShopItemGetCommonPrice(ride, rideEntry->shop_item[i]); if (price != MONEY32_UNDEFINED) { ride->price[i] = static_cast(price); @@ -263,9 +263,9 @@ GameActions::Result RideCreateAction::Execute() const } // Set the on-ride photo price, whether the ride has one or not (except shops). - if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY) && shop_item_has_common_price(ShopItem::Photo)) + if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY) && ShopItemHasCommonPrice(ShopItem::Photo)) { - money32 price = shop_item_get_common_price(ride, ShopItem::Photo); + money32 price = ShopItemGetCommonPrice(ride, ShopItem::Photo); if (price != MONEY32_UNDEFINED) { ride->price[1] = static_cast(price); @@ -318,7 +318,7 @@ GameActions::Result RideCreateAction::Execute() const ride->mode = ride->GetDefaultMode(); ride->MinCarsPerTrain = rideEntry->min_cars_in_train; ride->MaxCarsPerTrain = rideEntry->max_cars_in_train; - ride_set_vehicle_colours_to_random_preset(*ride, _colour2); + RideSetVehicleColoursToRandomPreset(*ride, _colour2); WindowInvalidateByClass(WindowClass::RideList); res.Expenditure = ExpenditureType::RideConstruction; diff --git a/src/openrct2/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp index dd4c997cf9..995c3f9f45 100644 --- a/src/openrct2/actions/RideDemolishAction.cpp +++ b/src/openrct2/actions/RideDemolishAction.cpp @@ -57,7 +57,7 @@ void RideDemolishAction::Serialise(DataSerialiser& stream) GameActions::Result RideDemolishAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -101,7 +101,7 @@ GameActions::Result RideDemolishAction::Query() const GameActions::Result RideDemolishAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -123,12 +123,12 @@ GameActions::Result RideDemolishAction::DemolishRide(Ride& ride) const { money32 refundPrice = DemolishTracks(); - ride_clear_for_construction(ride); + RideClearForConstruction(ride); ride.RemovePeeps(); ride.StopGuestsQueuing(); ride.ValidateStations(); - ride_clear_leftover_entrances(ride); + RideClearLeftoverEntrances(ride); const auto rideId = ride.id; News::DisableNewsItems(News::ItemType::Ride, rideId.ToUnderlying()); @@ -296,5 +296,5 @@ money32 RideDemolishAction::GetRefurbishPrice(const Ride& ride) const money32 RideDemolishAction::GetRefundPrice(const Ride& ride) const { - return ride_get_refund_price(ride); + return RideGetRefundPrice(ride); } diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index da1bbe8f74..8d4cdb282f 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -52,7 +52,7 @@ GameActions::Result RideEntranceExitPlaceAction::Query() const const auto errorTitle = _isExit ? STR_CANT_BUILD_MOVE_EXIT_FOR_THIS_RIDE_ATTRACTION : STR_CANT_BUILD_MOVE_ENTRANCE_FOR_THIS_RIDE_ATTRACTION; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -133,7 +133,7 @@ GameActions::Result RideEntranceExitPlaceAction::Execute() const // When in known station num mode rideIndex is known and z is unknown const auto errorTitle = _isExit ? STR_CANT_BUILD_MOVE_EXIT_FOR_THIS_RIDE_ATTRACTION : STR_CANT_BUILD_MOVE_ENTRANCE_FOR_THIS_RIDE_ATTRACTION; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -142,7 +142,7 @@ GameActions::Result RideEntranceExitPlaceAction::Execute() const if (!(GetFlags() & GAME_COMMAND_FLAG_GHOST)) { - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); } diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp index 66f9e71da1..44b5a0a1a0 100644 --- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp @@ -66,7 +66,7 @@ static TileElement* FindEntranceElement( GameActions::Result RideEntranceExitRemoveAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid ride id %u for entrance/exit removal", _rideIndex.ToUnderlying()); @@ -109,7 +109,7 @@ GameActions::Result RideEntranceExitRemoveAction::Query() const GameActions::Result RideEntranceExitRemoveAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid ride id %u for entrance/exit removal", _rideIndex.ToUnderlying()); @@ -119,9 +119,9 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST; if (!isGhost) { - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); - invalidate_test_results(*ride); + InvalidateTestResults(*ride); } auto* entranceElement = FindEntranceElement( diff --git a/src/openrct2/actions/RideFreezeRatingAction.cpp b/src/openrct2/actions/RideFreezeRatingAction.cpp index b097a5fd9c..2045e89d9e 100644 --- a/src/openrct2/actions/RideFreezeRatingAction.cpp +++ b/src/openrct2/actions/RideFreezeRatingAction.cpp @@ -31,7 +31,7 @@ void RideFreezeRatingAction::Serialise(DataSerialiser& stream) GameActions::Result RideFreezeRatingAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -49,7 +49,7 @@ GameActions::Result RideFreezeRatingAction::Query() const GameActions::Result RideFreezeRatingAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); switch (_type) { diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp index b678fd9c54..5b7a3c7ae2 100644 --- a/src/openrct2/actions/RideSetAppearanceAction.cpp +++ b/src/openrct2/actions/RideSetAppearanceAction.cpp @@ -50,7 +50,7 @@ void RideSetAppearanceAction::Serialise(DataSerialiser& stream) GameActions::Result RideSetAppearanceAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -91,7 +91,7 @@ GameActions::Result RideSetAppearanceAction::Query() const GameActions::Result RideSetAppearanceAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -114,15 +114,15 @@ GameActions::Result RideSetAppearanceAction::Execute() const break; case RideSetAppearanceType::VehicleColourBody: ride->vehicle_colours[_index].Body = _value; - ride_update_vehicle_colours(*ride); + RideUpdateVehicleColours(*ride); break; case RideSetAppearanceType::VehicleColourTrim: ride->vehicle_colours[_index].Trim = _value; - ride_update_vehicle_colours(*ride); + RideUpdateVehicleColours(*ride); break; case RideSetAppearanceType::VehicleColourTernary: ride->vehicle_colours[_index].Tertiary = _value; - ride_update_vehicle_colours(*ride); + RideUpdateVehicleColours(*ride); break; case RideSetAppearanceType::VehicleColourScheme: ride->colour_scheme_type &= ~( @@ -132,7 +132,7 @@ GameActions::Result RideSetAppearanceAction::Execute() const { ride->vehicle_colours[i] = ride->vehicle_colours[0]; } - ride_update_vehicle_colours(*ride); + RideUpdateVehicleColours(*ride); break; case RideSetAppearanceType::EntranceStyle: ride->entrance_style = _value; diff --git a/src/openrct2/actions/RideSetNameAction.cpp b/src/openrct2/actions/RideSetNameAction.cpp index 847f4c2ff7..d71e84a971 100644 --- a/src/openrct2/actions/RideSetNameAction.cpp +++ b/src/openrct2/actions/RideSetNameAction.cpp @@ -47,7 +47,7 @@ void RideSetNameAction::Serialise(DataSerialiser& stream) GameActions::Result RideSetNameAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -65,7 +65,7 @@ GameActions::Result RideSetNameAction::Query() const GameActions::Result RideSetNameAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index 2a138a3e31..c14395c88c 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -51,7 +51,7 @@ GameActions::Result RideSetPriceAction::Query() const { GameActions::Result res = GameActions::Result(); - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -73,7 +73,7 @@ GameActions::Result RideSetPriceAction::Execute() const GameActions::Result res = GameActions::Result(); res.Expenditure = ExpenditureType::ParkRideTickets; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -110,7 +110,7 @@ GameActions::Result RideSetPriceAction::Execute() const } } // Check same price in park flags - if (!shop_item_has_common_price(shopItem)) + if (!ShopItemHasCommonPrice(shopItem)) { ride->price[0] = _price; WindowInvalidateByClass(WindowClass::Ride); @@ -131,7 +131,7 @@ GameActions::Result RideSetPriceAction::Execute() const } } // Check same price in park flags - if (!shop_item_has_common_price(shopItem)) + if (!ShopItemHasCommonPrice(shopItem)) { ride->price[1] = _price; WindowInvalidateByClass(WindowClass::Ride); diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index 06f483d4c2..08e158a055 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -42,7 +42,7 @@ void RideSetSettingAction::Serialise(DataSerialiser& stream) GameActions::Result RideSetSettingAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid ride: #%u.", _rideIndex.ToUnderlying()); @@ -152,7 +152,7 @@ GameActions::Result RideSetSettingAction::Query() const GameActions::Result RideSetSettingAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid ride: #%u.", _rideIndex.ToUnderlying()); @@ -162,8 +162,8 @@ GameActions::Result RideSetSettingAction::Execute() const switch (_setting) { case RideSetSetting::Mode: - invalidate_test_results(*ride); - ride_clear_for_construction(*ride); + InvalidateTestResults(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); ride->mode = static_cast(_value); @@ -182,7 +182,7 @@ GameActions::Result RideSetSettingAction::Execute() const ride->min_waiting_time = std::min(_value, ride->min_waiting_time); break; case RideSetSetting::Operation: - invalidate_test_results(*ride); + InvalidateTestResults(*ride); ride->operation_option = _value; break; case RideSetSetting::InspectionInterval: @@ -212,14 +212,14 @@ GameActions::Result RideSetSettingAction::Execute() const if (_value != ride->lift_hill_speed) { ride->lift_hill_speed = _value; - invalidate_test_results(*ride); + InvalidateTestResults(*ride); } break; case RideSetSetting::NumCircuits: if (_value != ride->num_circuits) { ride->num_circuits = _value; - invalidate_test_results(*ride); + InvalidateTestResults(*ride); } break; diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index 80ccbd95f2..bd4d58da4a 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -57,7 +57,7 @@ GameActions::Result RideSetStatusAction::Query() const { GameActions::Result res = GameActions::Result(); - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -121,7 +121,7 @@ GameActions::Result RideSetStatusAction::Execute() const GameActions::Result res = GameActions::Result(); res.Expenditure = ExpenditureType::RideRunningCosts; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -150,7 +150,7 @@ GameActions::Result RideSetStatusAction::Execute() const if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { ride->lifecycle_flags &= ~RIDE_LIFECYCLE_CRASHED; - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); } } @@ -164,7 +164,7 @@ GameActions::Result RideSetStatusAction::Execute() const case RideStatus::Simulating: { ride->lifecycle_flags &= ~RIDE_LIFECYCLE_CRASHED; - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); const auto modeSwitchResult = ride->Simulate(true); @@ -195,7 +195,7 @@ GameActions::Result RideSetStatusAction::Execute() const if (ride->status == RideStatus::Simulating) { - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); } diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index 14c730f9c5..79a450cb41 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -66,7 +66,7 @@ GameActions::Result RideSetVehicleAction::Query() const } auto errTitle = SetVehicleTypeErrorTitle[EnumValue(_type)]; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -123,7 +123,7 @@ GameActions::Result RideSetVehicleAction::Query() const GameActions::Result RideSetVehicleAction::Execute() const { auto errTitle = SetVehicleTypeErrorTitle[EnumValue(_type)]; - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid game command, ride_id = %u", _rideIndex.ToUnderlying()); @@ -133,7 +133,7 @@ GameActions::Result RideSetVehicleAction::Execute() const switch (_type) { case RideSetVehicleType::NumTrains: - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); ride->vehicle_change_timeout = 100; @@ -141,11 +141,11 @@ GameActions::Result RideSetVehicleAction::Execute() const break; case RideSetVehicleType::NumCarsPerTrain: { - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); ride->vehicle_change_timeout = 100; - invalidate_test_results(*ride); + InvalidateTestResults(*ride); auto rideEntry = get_ride_entry(ride->subtype); if (rideEntry == nullptr) { @@ -163,11 +163,11 @@ GameActions::Result RideSetVehicleAction::Execute() const } case RideSetVehicleType::RideEntry: { - ride_clear_for_construction(*ride); + RideClearForConstruction(*ride); ride->RemovePeeps(); ride->vehicle_change_timeout = 100; - invalidate_test_results(*ride); + InvalidateTestResults(*ride); ride->subtype = _value; auto rideEntry = get_ride_entry(ride->subtype); if (rideEntry == nullptr) @@ -176,7 +176,7 @@ GameActions::Result RideSetVehicleAction::Execute() const return GameActions::Result(GameActions::Status::InvalidParameters, errTitle, STR_NONE); } - ride_set_vehicle_colours_to_random_preset(*ride, _colour); + RideSetVehicleColoursToRandomPreset(*ride, _colour); if (!gCheatsDisableTrainLengthLimit) { ride->proposed_num_cars_per_train = std::clamp( diff --git a/src/openrct2/actions/TrackDesignAction.cpp b/src/openrct2/actions/TrackDesignAction.cpp index 4ebfb332c2..b52d89a85d 100644 --- a/src/openrct2/actions/TrackDesignAction.cpp +++ b/src/openrct2/actions/TrackDesignAction.cpp @@ -84,7 +84,7 @@ GameActions::Result TrackDesignAction::Query() const } const auto rideIndex = r.GetData(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { log_warning("Invalid game command for track placement, ride id = %d", rideIndex); @@ -156,7 +156,7 @@ GameActions::Result TrackDesignAction::Execute() const } const auto rideIndex = r.GetData(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { log_warning("Invalid game command for track placement, ride id = %d", rideIndex); @@ -213,12 +213,12 @@ GameActions::Result TrackDesignAction::Execute() const if (entryIndex != OBJECT_ENTRY_INDEX_NULL) { - auto colour = ride_get_unused_preset_vehicle_colour(entryIndex); + auto colour = RideGetUnusedPresetVehicleColour(entryIndex); auto rideSetVehicleAction = RideSetVehicleAction(ride->id, RideSetVehicleType::RideEntry, entryIndex, colour); GameActions::ExecuteNested(&rideSetVehicleAction); } - set_operating_setting_nested(ride->id, RideSetSetting::Mode, static_cast(_td.ride_mode), GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::Mode, static_cast(_td.ride_mode), GAME_COMMAND_FLAG_APPLY); auto rideSetVehicleAction2 = RideSetVehicleAction(ride->id, RideSetVehicleType::NumTrains, _td.number_of_trains); GameActions::ExecuteNested(&rideSetVehicleAction2); @@ -226,18 +226,18 @@ GameActions::Result TrackDesignAction::Execute() const ride->id, RideSetVehicleType::NumCarsPerTrain, _td.number_of_cars_per_train); GameActions::ExecuteNested(&rideSetVehicleAction3); - set_operating_setting_nested(ride->id, RideSetSetting::Departure, _td.depart_flags, GAME_COMMAND_FLAG_APPLY); - set_operating_setting_nested(ride->id, RideSetSetting::MinWaitingTime, _td.min_waiting_time, GAME_COMMAND_FLAG_APPLY); - set_operating_setting_nested(ride->id, RideSetSetting::MaxWaitingTime, _td.max_waiting_time, GAME_COMMAND_FLAG_APPLY); - set_operating_setting_nested(ride->id, RideSetSetting::Operation, _td.operation_setting, GAME_COMMAND_FLAG_APPLY); - set_operating_setting_nested(ride->id, RideSetSetting::LiftHillSpeed, _td.lift_hill_speed & 0x1F, GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::Departure, _td.depart_flags, GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::MinWaitingTime, _td.min_waiting_time, GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::MaxWaitingTime, _td.max_waiting_time, GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::Operation, _td.operation_setting, GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::LiftHillSpeed, _td.lift_hill_speed & 0x1F, GAME_COMMAND_FLAG_APPLY); uint8_t num_circuits = _td.num_circuits; if (num_circuits == 0) { num_circuits = 1; } - set_operating_setting_nested(ride->id, RideSetSetting::NumCircuits, num_circuits, GAME_COMMAND_FLAG_APPLY); + SetOperatingSettingNested(ride->id, RideSetSetting::NumCircuits, num_circuits, GAME_COMMAND_FLAG_APPLY); ride->SetToDefaultInspectionInterval(); ride->lifecycle_flags |= RIDE_LIFECYCLE_NOT_CUSTOM_DESIGN; ride->colour_scheme_type = _td.colour_scheme; diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 2d32d1d2d2..920e98424a 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -67,7 +67,7 @@ void TrackPlaceAction::Serialise(DataSerialiser& stream) GameActions::Result TrackPlaceAction::Query() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid ride for track placement, rideIndex = %d", _rideIndex.ToUnderlying()); @@ -345,7 +345,7 @@ GameActions::Result TrackPlaceAction::Query() const int32_t entranceDirections = std::get<0>(ted.SequenceProperties); if ((entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN) && trackBlock->index == 0) { - const auto addElementResult = track_add_station_element( + const auto addElementResult = TrackAddStationElement( { mapLoc, baseZ, _origin.direction }, _rideIndex, 0, _fromTrackDesign); if (!addElementResult.Successful) { @@ -409,7 +409,7 @@ GameActions::Result TrackPlaceAction::Query() const GameActions::Result TrackPlaceAction::Execute() const { - auto ride = get_ride(_rideIndex); + auto ride = GetRide(_rideIndex); if (ride == nullptr) { log_warning("Invalid ride for track placement, rideIndex = %d", _rideIndex.ToUnderlying()); @@ -527,7 +527,7 @@ GameActions::Result TrackPlaceAction::Execute() const if (!(GetFlags() & GAME_COMMAND_FLAG_GHOST)) { - invalidate_test_results(*ride); + InvalidateTestResults(*ride); switch (_trackType) { case TrackElemType::OnRidePhoto: @@ -676,7 +676,7 @@ GameActions::Result TrackPlaceAction::Execute() const { if (trackBlock->index == 0) { - track_add_station_element({ mapLoc, _origin.direction }, _rideIndex, GAME_COMMAND_FLAG_APPLY, _fromTrackDesign); + TrackAddStationElement({ mapLoc, _origin.direction }, _rideIndex, GAME_COMMAND_FLAG_APPLY, _fromTrackDesign); } ride->ValidateStations(); ride->UpdateMaxVehicles(); diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index 1c363962c7..9bc89dde2e 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -124,7 +124,7 @@ GameActions::Result TrackRemoveAction::Query() const RideId rideIndex = tileElement->AsTrack()->GetRideIndex(); const auto trackType = tileElement->AsTrack()->GetTrackType(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { log_warning("Ride not found. ride index = %d.", rideIndex); @@ -211,7 +211,7 @@ GameActions::Result TrackRemoveAction::Query() const int32_t entranceDirections = std::get<0>(ted.SequenceProperties); if (entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN && (tileElement->AsTrack()->GetSequenceIndex() == 0)) { - const auto removeElementResult = track_remove_station_element({ mapLoc, _origin.direction }, rideIndex, 0); + const auto removeElementResult = TrackRemoveStationElement({ mapLoc, _origin.direction }, rideIndex, 0); if (!removeElementResult.Successful) { return GameActions::Result( @@ -319,7 +319,7 @@ GameActions::Result TrackRemoveAction::Execute() const const auto trackType = tileElement->AsTrack()->GetTrackType(); bool isLiftHill = tileElement->AsTrack()->HasChain(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { log_warning("Ride not found. ride index = %d.", rideIndex); @@ -395,7 +395,7 @@ GameActions::Result TrackRemoveAction::Execute() const int32_t entranceDirections = std::get<0>(ted.SequenceProperties); if (entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN && (tileElement->AsTrack()->GetSequenceIndex() == 0)) { - const auto removeElementResult = track_remove_station_element({ mapLoc, _origin.direction }, rideIndex, 0); + const auto removeElementResult = TrackRemoveStationElement({ mapLoc, _origin.direction }, rideIndex, 0); if (!removeElementResult.Successful) { return GameActions::Result( @@ -424,7 +424,7 @@ GameActions::Result TrackRemoveAction::Execute() const && !(ride->status == RideStatus::Simulating && tileElement->Flags & TILE_ELEMENT_FLAG_GHOST) && (tileElement->AsTrack()->GetSequenceIndex() == 0)) { - const auto removeElementResult = track_remove_station_element( + const auto removeElementResult = TrackRemoveStationElement( { mapLoc, _origin.direction }, rideIndex, GAME_COMMAND_FLAG_APPLY); if (!removeElementResult.Successful) { @@ -438,7 +438,7 @@ GameActions::Result TrackRemoveAction::Execute() const surfaceElement->SetHasTrackThatNeedsWater(false); } - invalidate_test_results(*ride); + InvalidateTestResults(*ride); FootpathQueueChainReset(); if (!gCheatsDisableClearanceChecks || !(tileElement->IsGhost())) { diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 43c64e71fe..29ffcc3944 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -405,7 +405,7 @@ bool WallPlaceAction::WallCheckObstructionWithTrack( const auto& ted = GetTrackElementDescriptor(trackType); int32_t sequence = trackElement->GetSequenceIndex(); int32_t direction = (_edge - trackElement->GetDirection()) & TILE_ELEMENT_DIRECTION_MASK; - auto ride = get_ride(trackElement->GetRideIndex()); + auto ride = GetRide(trackElement->GetRideIndex()); if (ride == nullptr) { return false; diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index f338234c36..ec0fe158b6 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -987,7 +987,7 @@ void Guest::Tick128UpdateGuest(int32_t index) if (GuestTimeOnRide > 22) { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { PeepThoughtType thought_type = ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IN_RIDE) @@ -1380,7 +1380,7 @@ void Guest::CheckIfLost() { if (!(PeepFlags & PEEP_FLAGS_LOST)) { - if (ride_get_count() < 2) + if (RideGetCount() < 2) return; PeepFlags ^= PEEP_FLAGS_21; @@ -1838,7 +1838,7 @@ Ride* Guest::FindBestRideToGoOn() { if (!(ride.lifecycle_flags & RIDE_LIFECYCLE_QUEUE_FULL)) { - if (ShouldGoOnRide(ride, StationIndex::FromUnderlying(0), false, true) && ride_has_ratings(ride)) + if (ShouldGoOnRide(ride, StationIndex::FromUnderlying(0), false, true) && RideHasRatings(ride)) { if (mostExcitingRide == nullptr || ride.excitement > mostExcitingRide->excitement) { @@ -1923,7 +1923,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // 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(RideTypeDescriptors)); if (!ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_TRANSPORT_RIDE) || ride.value == RIDE_VALUE_UNDEFINED - || ride_get_price(ride) != 0) + || RideGetPrice(ride) != 0) { if (PeepFlags & PEEP_FLAGS_LEAVING_PARK) { @@ -1982,7 +1982,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // Assuming the queue conditions are met, peeps will always go on free transport rides. // Ride ratings, recent crashes and weather will all be ignored. - money16 ridePrice = ride_get_price(ride); + money16 ridePrice = RideGetPrice(ride); if (!ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_TRANSPORT_RIDE) || ride.value == RIDE_VALUE_UNDEFINED || ridePrice != 0) { @@ -2029,7 +2029,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b return false; } - if (ride_has_ratings(ride)) + if (RideHasRatings(ride)) { // If a peep has already decided that they're going to go on a ride, they'll skip the weather and // excitement check and will only do a basic intensity check when they arrive at the ride itself. @@ -2119,7 +2119,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // If the ride has not yet been rated and is capable of having g-forces, // there's a 90% chance that the peep will ignore it. - if (!ride_has_ratings(ride) && ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES)) + if (!RideHasRatings(ride) && ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_PEEP_CHECK_GFORCES)) { if ((scenario_rand() & 0xFFFF) > 0x1999U) { @@ -2148,7 +2148,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b value /= 4; // Peeps won't pay more than twice the value of the ride. - ridePrice = ride_get_price(ride); + ridePrice = RideGetPrice(ride); if (ridePrice > static_cast(value * 2)) { if (peepAtRide) @@ -2217,7 +2217,7 @@ bool Guest::ShouldGoToShop(Ride& ride, bool peepAtShop) // The amount that peeps are willing to pay to use the Toilets scales with their toilet stat. // It effectively has a minimum of $0.10 (due to the check above) and a maximum of $0.60. - if (ride_get_price(ride) * 40 > Toilet) + if (RideGetPrice(ride) * 40 > Toilet) { if (peepAtShop) { @@ -2243,7 +2243,7 @@ bool Guest::ShouldGoToShop(Ride& ride, bool peepAtShop) } // Basic price checks - auto ridePrice = ride_get_price(ride); + auto ridePrice = RideGetPrice(ride); if (ridePrice != 0 && ridePrice > CashInPocket) { if (peepAtShop) @@ -2670,7 +2670,7 @@ static int16_t peep_calculate_ride_satisfaction(Guest* peep, const Ride& ride) if (peep->HasRiddenRideType(ride.type)) satisfaction += 10; - if (peep->HasRidden(*get_ride(peep->CurrentRide))) + if (peep->HasRidden(*GetRide(peep->CurrentRide))) satisfaction += 10; return satisfaction; @@ -2713,7 +2713,7 @@ static int16_t peep_calculate_ride_value_satisfaction(Guest* peep, const Ride& r return -30; } - money16 ridePrice = ride_get_price(ride); + money16 ridePrice = RideGetPrice(ride); if (ride.value >= ridePrice) { return -5; @@ -2735,7 +2735,7 @@ static int16_t peep_calculate_ride_value_satisfaction(Guest* peep, const Ride& r */ static int16_t peep_calculate_ride_intensity_nausea_satisfaction(Guest* peep, const Ride& ride) { - if (!ride_has_ratings(ride)) + if (!RideHasRatings(ride)) { return 70; } @@ -2846,7 +2846,7 @@ static bool peep_should_go_on_ride_again(Guest* peep, const Ride& ride) { if (!ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_PEEP_WILL_RIDE_AGAIN)) return false; - if (!ride_has_ratings(ride)) + if (!RideHasRatings(ride)) return false; if (ride.intensity > RIDE_RATING(10, 00) && !gCheatsIgnoreRideIntensity) return false; @@ -2891,7 +2891,7 @@ static bool peep_really_liked_ride(Guest* peep, const Ride& ride) return false; if (peep->Nausea > 120) return false; - if (!ride_has_ratings(ride)) + if (!RideHasRatings(ride)) return false; if (ride.intensity > RIDE_RATING(10, 00) && !gCheatsIgnoreRideIntensity) return false; @@ -2960,7 +2960,7 @@ static PeepThoughtType peep_assess_surroundings(int16_t centre_x, int16_t centre break; case TileElementType::Track: { - auto* ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto* ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr) break; @@ -3127,7 +3127,7 @@ template static void peep_head_for_nearest_ride(Guest* peep, bool co return; if (!peep->GuestHeadingToRideId.IsNull()) { - auto ride = get_ride(peep->GuestHeadingToRideId); + auto ride = GetRide(peep->GuestHeadingToRideId); if (ride != nullptr && predicate(*ride)) { return; @@ -3163,7 +3163,7 @@ template static void peep_head_for_nearest_ride(Guest* peep, bool co for (auto* trackElement : TileElementsView(location)) { auto rideIndex = trackElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) continue; @@ -3198,7 +3198,7 @@ template static void peep_head_for_nearest_ride(Guest* peep, bool co auto closestRideDistance = std::numeric_limits::max(); for (size_t i = 0; i < numPotentialRides; i++) { - auto ride = get_ride(potentialRides[i]); + auto ride = GetRide(potentialRides[i]); if (ride != nullptr) { auto rideLocation = ride->GetStation().Start; @@ -3301,7 +3301,7 @@ static bool peep_should_use_cash_machine(Guest* peep, RideId rideIndex) if (peep->Energy < 80) return false; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { ride->UpdateSatisfaction(peep->Happiness >> 6); @@ -3321,7 +3321,7 @@ void Guest::UpdateBuying() if (!CheckForPath()) return; - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr || ride->status != RideStatus::Open) { SetState(PeepState::Falling); @@ -3430,7 +3430,7 @@ void Guest::UpdateBuying() */ void Guest::UpdateRideAtEntrance() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -3484,7 +3484,7 @@ void Guest::UpdateRideAtEntrance() if (ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) return; - money16 ridePrice = ride_get_price(*ride); + money16 ridePrice = RideGetPrice(*ride); if (ridePrice != 0) { if (!peep_check_ride_price_at_entrance(this, *ride, ridePrice)) @@ -3540,7 +3540,7 @@ void PeepUpdateRideLeaveEntranceSpiralSlide(Guest* peep, Ride& ride, CoordsXYZD& { entrance_loc = { ride.GetStation(peep->CurrentRideStation).GetStart(), entrance_loc.direction }; - TileElement* tile_element = ride_get_station_start_track_element(ride, peep->CurrentRideStation); + TileElement* tile_element = RideGetStationStartTrackElement(ride, peep->CurrentRideStation); uint8_t direction_track = (tile_element == nullptr ? 0 : tile_element->GetDirection()); @@ -3605,7 +3605,7 @@ void Guest::UpdateRideLeaveEntranceWaypoints(const Ride& ride) Guard::Assert(!station.Entrance.IsNull()); uint8_t direction_entrance = station.Entrance.direction; - TileElement* tile_element = ride_get_station_start_track_element(ride, CurrentRideStation); + TileElement* tile_element = RideGetStationStartTrackElement(ride, CurrentRideStation); uint8_t direction_track = (tile_element == nullptr ? 0 : tile_element->GetDirection()); @@ -3638,7 +3638,7 @@ void Guest::UpdateRideLeaveEntranceWaypoints(const Ride& ride) */ void Guest::UpdateRideAdvanceThroughEntrance() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -3813,7 +3813,7 @@ static void peep_go_to_ride_exit(Peep* peep, const Ride& ride, int16_t x, int16_ */ void Guest::UpdateRideFreeVehicleEnterRide(Ride& ride) { - money16 ridePrice = ride_get_price(ride); + money16 ridePrice = RideGetPrice(ride); if (ridePrice != 0) { if ((HasItem(ShopItem::Voucher)) && (VoucherType == VOUCHER_TYPE_RIDE_FREE) && (VoucherRideId == CurrentRide)) @@ -3900,7 +3900,7 @@ static void peep_update_ride_no_free_vehicle_rejoin_queue(Guest* peep, Ride& rid */ void Guest::UpdateRideFreeVehicleCheck() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4015,7 +4015,7 @@ void Guest::UpdateRideApproachVehicle() void Guest::UpdateRideEnterVehicle() { - auto* ride = get_ride(CurrentRide); + auto* ride = GetRide(CurrentRide); if (ride != nullptr) { auto* vehicle = GetEntity(ride->vehicles[CurrentTrain]); @@ -4076,7 +4076,7 @@ void Guest::UpdateRideEnterVehicle() */ void Guest::UpdateRideLeaveVehicle() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4111,7 +4111,7 @@ void Guest::UpdateRideLeaveVehicle() if (ride_station.ToUnderlying() >= OpenRCT2::Limits::MaxStationsPerRide) { // HACK #5658: Some parks have hacked rides which end up in this state - auto bestStationIndex = ride_get_first_valid_station_exit(*ride); + auto bestStationIndex = RideGetFirstValidStationExit(*ride); if (bestStationIndex.IsNull()) { bestStationIndex = StationIndex::FromUnderlying(0); @@ -4243,7 +4243,7 @@ void Guest::UpdateRideLeaveVehicle() auto exitLocation = station.Exit.ToCoordsXYZD(); Guard::Assert(!exitLocation.IsNull()); - TileElement* trackElement = ride_get_station_start_track_element(*ride, CurrentRideStation); + TileElement* trackElement = RideGetStationStartTrackElement(*ride, CurrentRideStation); Direction station_direction = (trackElement == nullptr ? 0 : trackElement->GetDirection()); @@ -4288,7 +4288,7 @@ void Guest::UpdateRideLeaveVehicle() */ void Guest::UpdateRidePrepareForExit() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr || CurrentRideStation.ToUnderlying() >= std::size(ride->GetStations())) return; @@ -4340,7 +4340,7 @@ void Guest::UpdateRideApproachExit() */ void Guest::UpdateRideInExit() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4389,7 +4389,7 @@ CoordsXY GetGuestWaypointLocationEnterprise(const Vehicle& vehicle, const Ride& */ void Guest::UpdateRideApproachVehicleWaypoints() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4438,7 +4438,7 @@ void Guest::UpdateRideApproachVehicleWaypoints() void UpdateRideApproachVehicleWaypointsMotionSimulator(Guest& guest, const CoordsXY& loc, int16_t& xy_distance) { int16_t actionZ; - auto ride = get_ride(guest.CurrentRide); + auto ride = GetRide(guest.CurrentRide); // Motion simulators have steps this moves the peeps up the steps actionZ = ride->GetStation(guest.CurrentRideStation).GetBaseZ() + 2; @@ -4468,7 +4468,7 @@ void UpdateRideApproachVehicleWaypointsDefault(Guest& guest, const CoordsXY& loc */ void Guest::UpdateRideApproachExitWaypoints() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4562,7 +4562,7 @@ void Guest::UpdateRideApproachExitWaypoints() */ void Guest::UpdateRideApproachSpiralSlide() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4646,7 +4646,7 @@ static constexpr const CoordsXY _SpiralSlideEndWaypoint[] = { */ void Guest::UpdateRideOnSpiralSlide() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4737,7 +4737,7 @@ void Guest::UpdateRideLeaveSpiralSlide() return; } - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4811,7 +4811,7 @@ void Guest::UpdateRideMazePathfinding() return; } - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -4940,7 +4940,7 @@ void Guest::UpdateRideMazePathfinding() */ void Guest::UpdateRideLeaveExit() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (auto loc = UpdateAction(); loc.has_value()) { @@ -5006,7 +5006,7 @@ void Guest::UpdateRideShopApproach() */ void Guest::UpdateRideShopInteract() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; @@ -5074,7 +5074,7 @@ void Guest::UpdateRideShopLeave() // #11758 Previously SetState(PeepState::Walking) caused Peeps to double-back to exit point of shop SetState(PeepState::Falling); - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ride->total_customers++; @@ -5501,7 +5501,7 @@ void Guest::UpdateQueuing() RemoveFromQueue(); return; } - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr || ride->status != RideStatus::Open) { RemoveFromQueue(); @@ -6193,7 +6193,7 @@ static bool peep_should_watch_ride(TileElement* tileElement) return false; } - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr || !ride->IsRide()) { return false; @@ -6239,7 +6239,7 @@ static bool peep_should_watch_ride(TileElement* tileElement) bool loc_690FD0(Peep* peep, RideId* rideToView, uint8_t* rideSeatToView, TileElement* tileElement) { - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr) return false; @@ -6832,7 +6832,7 @@ void peep_thought_set_format_args(const PeepThought* thought, Formatter& ft) PeepThoughtToActionFlag flags = PeepThoughtToActionMap[EnumValue(thought->type)].flags; if (flags & PEEP_THOUGHT_ACTION_FLAG_RIDE) { - auto ride = get_ride(thought->rideId); + auto ride = GetRide(thought->rideId); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -7361,7 +7361,7 @@ bool Guest::UpdateQueuePosition(PeepActionType previous_action) */ void Guest::RemoveFromQueue() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) return; diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index e4f690eb7e..0d6d941c62 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -548,7 +548,7 @@ void peep_decrement_num_riders(Peep* peep) { if (peep->State == PeepState::OnRide || peep->State == PeepState::EnteringRide) { - auto ride = get_ride(peep->CurrentRide); + auto ride = GetRide(peep->CurrentRide); if (ride != nullptr) { ride->num_riders = std::max(0, ride->num_riders - 1); @@ -572,7 +572,7 @@ void peep_window_state_update(Peep* peep) { if (peep->State == PeepState::OnRide || peep->State == PeepState::EnteringRide) { - auto ride = get_ride(peep->CurrentRide); + auto ride = GetRide(peep->CurrentRide); if (ride != nullptr) { ride->num_riders++; @@ -1081,7 +1081,7 @@ void peep_problem_warnings_update() hungerCounter++; break; } - ride = get_ride(peep->GuestHeadingToRideId); + ride = GetRide(peep->GuestHeadingToRideId); if (ride != nullptr && !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE)) hungerCounter++; break; @@ -1092,7 +1092,7 @@ void peep_problem_warnings_update() thirstCounter++; break; } - ride = get_ride(peep->GuestHeadingToRideId); + ride = GetRide(peep->GuestHeadingToRideId); if (ride != nullptr && !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SELLS_DRINKS)) thirstCounter++; break; @@ -1103,7 +1103,7 @@ void peep_problem_warnings_update() toiletCounter++; break; } - ride = get_ride(peep->GuestHeadingToRideId); + ride = GetRide(peep->GuestHeadingToRideId); if (ride != nullptr && !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_TOILET)) toiletCounter++; break; @@ -1388,7 +1388,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::LeavingRide: case PeepState::EnteringRide: { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ft.Add(ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IN_RIDE) ? STR_IN_RIDE : STR_ON_RIDE); @@ -1403,7 +1403,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::Buying: { ft.Add(STR_AT_RIDE); - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -1422,7 +1422,7 @@ void Peep::FormatActionTo(Formatter& ft) const { if (!guest->GuestHeadingToRideId.IsNull()) { - auto ride = get_ride(guest->GuestHeadingToRideId); + auto ride = GetRide(guest->GuestHeadingToRideId); if (ride != nullptr) { ft.Add(STR_HEADING_FOR); @@ -1439,7 +1439,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::QueuingFront: case PeepState::Queuing: { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ft.Add(STR_QUEUING_FOR); @@ -1453,7 +1453,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::Watching: if (!CurrentRide.IsNull()) { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ft.Add((StandingFlags & 0x1) ? STR_WATCHING_CONSTRUCTION_OF : STR_WATCHING_RIDE); @@ -1497,7 +1497,7 @@ void Peep::FormatActionTo(Formatter& ft) const else { ft.Add(STR_RESPONDING_TO_RIDE_BREAKDOWN_CALL); - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -1511,7 +1511,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::Fixing: { ft.Add(STR_FIXING_RIDE); - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -1525,7 +1525,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::HeadingToInspection: { ft.Add(STR_HEADING_TO_RIDE_FOR_INSPECTION); - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -1539,7 +1539,7 @@ void Peep::FormatActionTo(Formatter& ft) const case PeepState::Inspecting: { ft.Add(STR_INSPECTING_RIDE); - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -1731,7 +1731,7 @@ static bool peep_interact_with_entrance(Peep* peep, const CoordsXYE& coords, uin if (entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -2201,7 +2201,7 @@ static void peep_interact_with_path(Peep* peep, const CoordsXYE& coords) { /* Peep is approaching the entrance of a ride queue. * Decide whether to go on the ride. */ - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr && guest->ShouldGoOnRide(*ride, stationNum, true, false)) { // Peep has decided to go on the ride at the queue. @@ -2271,7 +2271,7 @@ static void peep_interact_with_path(Peep* peep, const CoordsXYE& coords) static bool peep_interact_with_shop(Peep* peep, const CoordsXYE& coords) { RideId rideIndex = coords.element->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) return false; diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 6f329e1361..121939f1b6 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -615,7 +615,7 @@ Direction Staff::MechanicDirectionSurface() const { Direction direction = scenario_rand() & 3; - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr && (State == PeepState::Answering || State == PeepState::HeadingToInspection) && (scenario_rand() & 1)) { auto location = ride->GetStation(CurrentRideStation).Exit; @@ -694,7 +694,7 @@ Direction Staff::MechanicDirectionPath(uint8_t validDirections, PathElement* pat pathDirections |= (1 << direction); // Mechanic is heading to ride (either broken down or for inspection). - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride != nullptr && (State == PeepState::Answering || State == PeepState::HeadingToInspection)) { /* Find location of the exit for the target ride station @@ -873,7 +873,7 @@ bool Staff::IsMechanicHeadingToFixRideBlockingPath() if (trackElement == nullptr) return false; - auto ride = get_ride(trackElement->GetRideIndex()); + auto ride = GetRide(trackElement->GetRideIndex()); if (ride == nullptr) return false; @@ -1298,7 +1298,7 @@ void Staff::UpdateSweeping() */ void Staff::UpdateHeadingToInspect() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) { SetState(PeepState::Falling); @@ -1402,7 +1402,7 @@ void Staff::UpdateHeadingToInspect() */ void Staff::UpdateAnswering() { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr || ride->mechanic_status != RIDE_MECHANIC_STATUS_HEADING) { SetState(PeepState::Falling); @@ -1930,7 +1930,7 @@ static constexpr const uint32_t FixingSubstatesForBreakdown[9] = { */ void Staff::UpdateFixing(int32_t steps) { - auto ride = get_ride(CurrentRide); + auto ride = GetRide(CurrentRide); if (ride == nullptr) { SetState(PeepState::Falling); @@ -2054,7 +2054,7 @@ bool Staff::UpdateFixingMoveToBrokenDownVehicle(bool firstRun, const Ride& ride) { if (!firstRun) { - Vehicle* vehicle = ride_get_broken_vehicle(ride); + Vehicle* vehicle = RideGetBrokenVehicle(ride); if (vehicle == nullptr) { return true; @@ -2068,7 +2068,7 @@ bool Staff::UpdateFixingMoveToBrokenDownVehicle(bool firstRun, const Ride& ride) } auto trackType = vehicle->GetTrackType(); - if (track_type_is_station(trackType)) + if (TrackTypeIsStation(trackType)) { break; } @@ -2129,7 +2129,7 @@ bool Staff::UpdateFixingFixVehicle(bool firstRun, const Ride& ride) return false; } - Vehicle* vehicle = ride_get_broken_vehicle(ride); + Vehicle* vehicle = RideGetBrokenVehicle(ride); if (vehicle == nullptr) { return true; @@ -2170,7 +2170,7 @@ bool Staff::UpdateFixingFixVehicleMalfunction(bool firstRun, const Ride& ride) return false; } - Vehicle* vehicle = ride_get_broken_vehicle(ride); + Vehicle* vehicle = RideGetBrokenVehicle(ride); if (vehicle == nullptr) { return true; @@ -2307,7 +2307,7 @@ bool Staff::UpdateFixingMoveToStationStart(bool firstRun, const Ride& ride) Direction stationDirection = 0; track_begin_end trackBeginEnd; - while (track_block_get_previous(input, &trackBeginEnd)) + while (TrackBlockGetPrevious(input, &trackBeginEnd)) { if (trackBeginEnd.begin_element->AsTrack()->IsStation()) { @@ -2500,7 +2500,7 @@ bool Staff::UpdateFixingFinishFixOrInspect(bool firstRun, int32_t steps, Ride& r return false; } - ride_fix_breakdown(ride, steps); + RideFixBreakdown(ride, steps); ride.mechanic_status = RIDE_MECHANIC_STATUS_UNDEFINED; return true; } @@ -2556,7 +2556,7 @@ bool Staff::UpdateFixingLeaveByEntranceExit(bool firstRun, const Ride& ride) */ void Staff::UpdateRideInspected(RideId rideIndex) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { ride->lifecycle_flags &= ~RIDE_LIFECYCLE_DUE_INSPECTION; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index e85b45519e..8a9daf6a4e 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -200,7 +200,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ } else { - int32_t res = set_operating_setting(RideId::FromUnderlying(ride_index), RideSetSetting::RideType, type); + int32_t res = SetOperatingSetting(RideId::FromUnderlying(ride_index), RideSetSetting::RideType, type); if (res == MONEY32_UNDEFINED) { if (!gCheatsAllowArbitraryRideTypeChanges) @@ -230,7 +230,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ } else { - auto ride = get_ride(RideId::FromUnderlying(ride_index)); + auto ride = GetRide(RideId::FromUnderlying(ride_index)); if (mode >= static_cast(RideMode::Count)) { console.WriteFormatLine("Invalid ride mode."); @@ -242,7 +242,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ else { ride->mode = static_cast(mode & 0xFF); - invalidate_test_results(*ride); + InvalidateTestResults(*ride); } } } @@ -262,7 +262,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ } else { - auto ride = get_ride(RideId::FromUnderlying(ride_index)); + auto ride = GetRide(RideId::FromUnderlying(ride_index)); if (mass <= 0) { console.WriteFormatLine("Friction value must be strictly positive"); @@ -301,7 +301,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ else { auto rideIndex = RideId::FromUnderlying(ride_index); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (excitement <= 0) { console.WriteFormatLine("Excitement value must be strictly positive"); @@ -334,7 +334,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ else { auto rideIndex = RideId::FromUnderlying(ride_index); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (intensity <= 0) { console.WriteFormatLine("Intensity value must be strictly positive"); @@ -367,7 +367,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_ else { auto rideIndex = RideId::FromUnderlying(ride_index); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (nausea <= 0) { console.WriteFormatLine("Nausea value must be strictly positive"); @@ -1416,7 +1416,7 @@ static int32_t ConsoleCommandShowLimits(InteractiveConsole& console, [[maybe_unu const auto& tileElements = GetTileElements(); const auto tileElementCount = tileElements.size(); - int32_t rideCount = ride_get_count(); + int32_t rideCount = RideGetCount(); int32_t spriteCount = 0; for (int32_t i = 0; i < static_cast(EntityType::Count); ++i) { diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index ac4cb359d5..ee1788d990 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -742,7 +742,7 @@ void ViewportUpdateSmartFollowGuest(rct_window* window, const Guest* peep) if (peep->State == PeepState::OnRide || peep->State == PeepState::EnteringRide || (peep->State == PeepState::LeavingRide && peep->x == LOCATION_NULL)) { - auto ride = get_ride(peep->CurrentRide); + auto ride = GetRide(peep->CurrentRide); if (ride != nullptr && (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) { auto train = GetEntity(ride->vehicles[peep->CurrentTrain]); @@ -761,7 +761,7 @@ void ViewportUpdateSmartFollowGuest(rct_window* window, const Guest* peep) if (peep->x == LOCATION_NULL && overallFocus) { - auto ride = get_ride(peep->CurrentRide); + auto ride = GetRide(peep->CurrentRide); if (ride != nullptr) { auto xy = ride->overall_view.ToTileCentre(); diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 731461da6e..656674c6ba 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -159,7 +159,7 @@ static bool award_is_deserved_best_rollercoasters([[maybe_unused]] int32_t activ continue; } - if (!ride_entry_has_category(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER)) + if (!RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER)) { continue; } @@ -415,7 +415,7 @@ static bool award_is_deserved_most_disappointing(int32_t activeAwardTypes) auto disappointingRides = 0; for (const auto& ride : GetRideManager()) { - if (ride_has_ratings(ride) && ride.popularity != 0xFF) + if (RideHasRatings(ride) && ride.popularity != 0xFF) { countedRides++; if (ride.popularity <= 6) @@ -446,7 +446,7 @@ static bool award_is_deserved_best_water_rides([[maybe_unused]] int32_t activeAw continue; } - if (!ride_entry_has_category(*rideEntry, RIDE_CATEGORY_WATER)) + if (!RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_WATER)) { continue; } @@ -553,7 +553,7 @@ static bool award_is_deserved_best_gentle_rides([[maybe_unused]] int32_t activeA continue; } - if (!ride_entry_has_category(*rideEntry, RIDE_CATEGORY_GENTLE)) + if (!RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_GENTLE)) { continue; } diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index ea47879a82..ab705975f7 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -59,7 +59,7 @@ uint16_t marketing_get_campaign_guest_generation_probability(int32_t campaignTyp break; case ADVERTISING_CAMPAIGN_RIDE_FREE: { - auto ride = get_ride(campaign->RideId); + auto ride = GetRide(campaign->RideId); if (ride == nullptr || ride->price[0] < 0.30_GBP) probability /= 8; break; @@ -77,7 +77,7 @@ static void marketing_raise_finished_notification(const MarketingCampaign& campa // This sets the string parameters for the marketing types that have an argument. if (campaign.Type == ADVERTISING_CAMPAIGN_RIDE_FREE || campaign.Type == ADVERTISING_CAMPAIGN_RIDE) { - auto ride = get_ride(campaign.RideId); + auto ride = GetRide(campaign.RideId); if (ride != nullptr) { ride->FormatNameTo(ft); diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 0b9161cfc8..eddcd9b7ec 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -213,7 +213,7 @@ std::optional News::GetSubjectLocation(News::ItemType type, int32_t s { case News::ItemType::Ride: { - Ride* ride = get_ride(RideId::FromUnderlying(subject)); + Ride* ride = GetRide(RideId::FromUnderlying(subject)); if (ride == nullptr || ride->overall_view.IsNull()) { break; @@ -239,7 +239,7 @@ std::optional News::GetSubjectLocation(News::ItemType type, int32_t s } // Find which ride peep is on - Ride* ride = get_ride(peep->CurrentRide); + Ride* ride = GetRide(peep->CurrentRide); if (ride == nullptr || !(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) { subjectLoc = std::nullopt; diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index cc18258502..e648384f25 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -255,7 +255,7 @@ void research_finish_item(ResearchItem* researchItem) if (GetRideTypeDescriptor(base_ride_type).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY) || researchItem->flags & RESEARCH_ENTRY_FLAG_FIRST_OF_TYPE) { - RideNaming naming = get_ride_naming(base_ride_type, *rideEntry); + RideNaming naming = GetRideNaming(base_ride_type, *rideEntry); availabilityString = STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE; ft.Add(naming.Name); } @@ -264,7 +264,7 @@ void research_finish_item(ResearchItem* researchItem) else { availabilityString = STR_NEWS_ITEM_RESEARCH_NEW_VEHICLE_AVAILABLE; - RideNaming baseRideNaming = get_ride_naming(base_ride_type, *rideEntry); + RideNaming baseRideNaming = GetRideNaming(base_ride_type, *rideEntry); ft.Add(baseRideNaming.Name); ft.Add(rideEntry->naming.Name); diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 42e633299e..0e915790b2 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -2702,7 +2702,7 @@ void NetworkBase::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connecti network_chat_show_connected_message(); // Fix invalid vehicle sprite sizes, thus preventing visual corruption of sprites - fix_invalid_vehicle_sprite_sizes(); + FixInvalidVehicleSpriteSizes(); // NOTE: Game actions are normally processed before processing the player list. // Given that during map load game actions are buffered we have to process the diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index b4c721ae31..054beb3226 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -45,7 +45,7 @@ static void PaintRideEntranceExitScrollingText( if (entranceEl.GetEntranceType() == ENTRANCE_TYPE_RIDE_EXIT) return; - auto ride = get_ride(entranceEl.GetRideIndex()); + auto ride = GetRide(entranceEl.GetRideIndex()); if (ride == nullptr) return; @@ -117,7 +117,7 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3 return; } - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { return; diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index 4bbaa748d3..039d5e0d07 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -351,7 +351,7 @@ void PaintLargeScenery(PaintSession& session, uint8_t direction, uint16_t height auto isGhost = false; ImageId imageTemplate; - if (gTrackDesignSaveMode && !track_design_save_contains_tile_element(reinterpret_cast(&tileElement))) + if (gTrackDesignSaveMode && !TrackDesignSaveContainsTileElement(reinterpret_cast(&tileElement))) { imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); isGhost = true; diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index 63e6a615e0..3c40c33c79 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -439,7 +439,7 @@ static void PathPaintFencesAndQueueBanners( direction--; // If text shown - auto ride = get_ride(pathElement.GetRideIndex()); + auto ride = GetRide(pathElement.GetRideIndex()); if (direction < 2 && ride != nullptr && !imageTemplate.IsRemap()) { uint16_t scrollingMode = pathPaintInfo.ScrollingMode; @@ -980,7 +980,7 @@ void PaintPath(PaintSession& session, uint16_t height, const PathElement& tileEl return; } - if (!track_design_save_contains_tile_element(reinterpret_cast(&tileElement))) + if (!TrackDesignSaveContainsTileElement(reinterpret_cast(&tileElement))) { imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); } diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index d5e2616f2d..4af8373a94 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -336,7 +336,7 @@ void PaintSmallScenery(PaintSession& session, uint8_t direction, int32_t height, ImageId imageTemplate; if (gTrackDesignSaveMode) { - if (!track_design_save_contains_tile_element(reinterpret_cast(&sceneryElement))) + if (!TrackDesignSaveContainsTileElement(reinterpret_cast(&sceneryElement))) { imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); } diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 19d0be5593..9e77849097 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -327,7 +327,7 @@ void PaintWall(PaintSession& session, uint8_t direction, int32_t height, const W auto isGhost = false; if (gTrackDesignSaveMode || (session.ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)) { - if (!track_design_save_contains_tile_element(reinterpret_cast(&wallElement))) + if (!TrackDesignSaveContainsTileElement(reinterpret_cast(&wallElement))) { imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); isGhost = true; diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 3a8c8af947..36fe5aea74 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1060,7 +1060,7 @@ namespace OpenRCT2 continue; auto* trackElement = tileElement->AsTrack(); - const auto* ride = get_ride(trackElement->GetRideIndex()); + const auto* ride = GetRide(trackElement->GetRideIndex()); if (ride != nullptr) { trackElement->SetRideType(ride->type); @@ -1156,7 +1156,7 @@ namespace OpenRCT2 std::vector rideIds; if (cs.GetMode() == OrcaStream::Mode::READING) { - ride_init_all(); + RideInitAll(); } else { diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 51d3cf803a..84011a32b4 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -347,7 +347,7 @@ static uint8_t footpath_element_dest_in_dir(TileCoordsXYZ loc, Direction chosenD if (loc.z != tileElement->base_height) continue; RideId rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) { *outRideIndex = rideIndex; @@ -765,7 +765,7 @@ static void peep_pathfind_heuristic_search( /* For peeps heading for a shop, the goal is the shop * tile. */ rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || !ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) continue; @@ -2156,7 +2156,7 @@ int32_t OriginalPathfinding::CalculateNextDestination(Guest& peep) // Peep is heading for a ride. RideId rideIndex = peep.GuestHeadingToRideId; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || ride->status != RideStatus::Open) { #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ef4be2da09..e73cb6f32d 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -194,7 +194,7 @@ namespace RCT1 FixUrbanPark(); CountBlockSections(); SetDefaultNames(); - determine_ride_entrance_and_exit_locations(); + DetermineRideEntranceAndExitLocations(); research_determine_first_of_type(); @@ -1172,7 +1172,7 @@ namespace RCT1 { if (src.ride_index != RCT12_RIDE_ID_NULL) { - auto ride = get_ride(RCT12RideIdToOpenRCT2RideId(src.ride_index)); + auto ride = GetRide(RCT12RideIdToOpenRCT2RideId(src.ride_index)); if (ride != nullptr) { ride->measurement = std::make_unique(); @@ -1651,7 +1651,7 @@ namespace RCT1 { auto dst2 = dst->AsTrack(); auto src2 = src->AsTrack(); - const auto* ride = get_ride(RCT12RideIdToOpenRCT2RideId(src2->GetRideIndex())); + const auto* ride = GetRide(RCT12RideIdToOpenRCT2RideId(src2->GetRideIndex())); auto rideType = (ride != nullptr) ? ride->type : RIDE_TYPE_NULL; dst2->SetTrackType(RCT1TrackTypeToOpenRCT2(src2->GetTrackType(), rideType)); @@ -2534,7 +2534,7 @@ namespace RCT1 } // Now, swap the entrance and exit. - auto ride = get_ride(merryGoRoundId); + auto ride = GetRide(merryGoRoundId); if (ride != nullptr) { auto& station = ride->GetStation(); @@ -2592,7 +2592,7 @@ namespace RCT1 } RideId rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { ride->num_block_brakes++; @@ -2707,7 +2707,7 @@ namespace RCT1 { auto* dst = CreateEntityAt<::Vehicle>(EntityId::FromUnderlying(srcBase.sprite_index)); auto* src = static_cast(&srcBase); - const auto* ride = get_ride(RideId::FromUnderlying(src->ride)); + const auto* ride = GetRide(RideId::FromUnderlying(src->ride)); if (ride == nullptr) return; diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 33c171b507..e669bf8f2a 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -221,7 +221,7 @@ uint8_t RCT12TrackElement::GetColourScheme() const uint8_t RCT12TrackElement::GetStationIndex() const { - if (track_type_is_station(trackType) || trackType == TrackElemType::TowerBase) + if (TrackTypeIsStation(trackType) || trackType == TrackElemType::TowerBase) { return (sequence & RCT12_TRACK_ELEMENT_SEQUENCE_STATION_INDEX_MASK) >> 4; } @@ -254,7 +254,7 @@ uint8_t RCT12TrackElement::GetBrakeBoosterSpeed() const bool RCT12TrackElement::HasGreenLight() const { - if (track_type_is_station(trackType)) + if (TrackTypeIsStation(trackType)) { return (sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0; } diff --git a/src/openrct2/rct2/RCT2.cpp b/src/openrct2/rct2/RCT2.cpp index 241a8c6124..763fb81070 100644 --- a/src/openrct2/rct2/RCT2.cpp +++ b/src/openrct2/rct2/RCT2.cpp @@ -26,15 +26,15 @@ namespace RCT2 switch (rct2RideType) { case RIDE_TYPE_CORKSCREW_ROLLER_COASTER: - if (!ride_entry_get_supported_track_pieces(rideEntry).get(TRACK_VERTICAL_LOOP)) + if (!RideEntryGetSupportedTrackPieces(rideEntry).get(TRACK_VERTICAL_LOOP)) return RIDE_TYPE_HYPERCOASTER; return RIDE_TYPE_CORKSCREW_ROLLER_COASTER; case RIDE_TYPE_JUNIOR_ROLLER_COASTER: - if (ride_entry_get_supported_track_pieces(rideEntry).get(TRACK_SLOPE_STEEP_DOWN)) + if (RideEntryGetSupportedTrackPieces(rideEntry).get(TRACK_SLOPE_STEEP_DOWN)) return RIDE_TYPE_CLASSIC_MINI_ROLLER_COASTER; return RIDE_TYPE_JUNIOR_ROLLER_COASTER; case RIDE_TYPE_CAR_RIDE: - if (ride_entry_get_supported_track_pieces(rideEntry).get(TRACK_SLOPE_STEEP_DOWN)) + if (RideEntryGetSupportedTrackPieces(rideEntry).get(TRACK_SLOPE_STEEP_DOWN)) return RIDE_TYPE_MONSTER_TRUCKS; return RIDE_TYPE_CAR_RIDE; case RIDE_TYPE_TWISTER_ROLLER_COASTER: @@ -42,7 +42,7 @@ namespace RCT2 return RIDE_TYPE_HYPER_TWISTER; return RIDE_TYPE_TWISTER_ROLLER_COASTER; case RIDE_TYPE_STEEL_WILD_MOUSE: - if (!ride_entry_get_supported_track_pieces(rideEntry).get(TRACK_SLOPE_STEEP_DOWN)) + if (!RideEntryGetSupportedTrackPieces(rideEntry).get(TRACK_SLOPE_STEEP_DOWN)) return RIDE_TYPE_SPINNING_WILD_MOUSE; return RIDE_TYPE_STEEL_WILD_MOUSE; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 86975de966..33d123ec3d 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -501,7 +501,7 @@ namespace RCT2 // Fix and set dynamic variables MapStripGhostFlagFromElements(); ConvertScenarioStringsToUTF8(); - determine_ride_entrance_and_exit_locations(); + DetermineRideEntranceAndExitLocations(); park.Name = GetUserString(_s6.park_name); @@ -1102,7 +1102,7 @@ namespace RCT2 if (src.ride_index != RCT12_RIDE_ID_NULL) { const auto rideId = RideId::FromUnderlying(src.ride_index); - auto ride = get_ride(rideId); + auto ride = GetRide(rideId); if (ride != nullptr) { ride->measurement = std::make_unique(); diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index b6c14915f4..72c037622b 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -21,7 +21,7 @@ #include -Vehicle* cable_lift_segment_create( +Vehicle* CableLiftSegmentCreate( Ride& ride, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance, bool head) { Vehicle* current = CreateEntity(); @@ -252,7 +252,7 @@ bool Vehicle::CableLiftUpdateTrackMotionForwards() auto input = CoordsXYE{ TrackLocation, trackElement }; - if (!track_block_get_next(&input, &output, &outputZ, &outputDirection)) + if (!TrackBlockGetNext(&input, &output, &outputZ, &outputDirection)) return false; if (TrackPitchAndRollEnd(trackType) != TrackPitchAndRollStart(output.element->AsTrack()->GetTrackType())) @@ -312,7 +312,7 @@ bool Vehicle::CableLiftUpdateTrackMotionBackwards() auto input = CoordsXYE{ TrackLocation, trackElement }; track_begin_end output; - if (!track_block_get_previous(input, &output)) + if (!TrackBlockGetPrevious(input, &output)) return false; if (TrackPitchAndRollStart(trackType) != TrackPitchAndRollEnd(output.begin_element->AsTrack()->GetTrackType())) diff --git a/src/openrct2/ride/CableLift.h b/src/openrct2/ride/CableLift.h index 271cc6ac8b..0d7f4b76a6 100644 --- a/src/openrct2/ride/CableLift.h +++ b/src/openrct2/ride/CableLift.h @@ -14,5 +14,5 @@ struct Vehicle; struct Ride; -Vehicle* cable_lift_segment_create( +Vehicle* CableLiftSegmentCreate( Ride& ride, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance, bool head); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 006e4de28d..d9f122dc05 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -181,7 +181,7 @@ Ride* GetOrAllocateRide(RideId index) return result; } -Ride* get_ride(RideId index) +Ride* GetRide(RideId index) { const auto idx = index.ToUnderlying(); if (idx < _rides.size()) @@ -210,7 +210,7 @@ rct_ride_entry* get_ride_entry(ObjectEntryIndex index) return result; } -std::string_view get_ride_entry_name(ObjectEntryIndex index) +std::string_view GetRideEntryName(ObjectEntryIndex index) { if (index >= object_entry_group_counts[EnumValue(ObjectType::Ride)]) { @@ -231,7 +231,7 @@ rct_ride_entry* Ride::GetRideEntry() const return get_ride_entry(subtype); } -int32_t ride_get_count() +int32_t RideGetCount() { return static_cast(GetRideManager().size()); } @@ -340,7 +340,7 @@ void Ride::QueueInsertGuestAtFront(StationIndex stationIndex, Guest* peep) * * rct2: 0x006AC916 */ -void ride_update_favourited_stat() +void RideUpdateFavouritedStat() { for (auto& ride : GetRideManager()) ride.guests_favourite = 0; @@ -349,7 +349,7 @@ void ride_update_favourited_stat() { if (!peep->FavouriteRide.IsNull()) { - auto ride = get_ride(peep->FavouriteRide); + auto ride = GetRide(peep->FavouriteRide); if (ride != nullptr) { ride->guests_favourite++; @@ -373,8 +373,8 @@ money64 Ride::CalculateIncomePerHour() const { return 0; } - auto customersPerHour = ride_customers_per_hour(*this); - money64 priceMinusCost = ride_get_price(*this); + auto customersPerHour = RideCustomersPerHour(*this); + money64 priceMinusCost = RideGetPrice(*this); ShopItem currentShopItem = entry->shop_item[0]; if (currentShopItem != ShopItem::None) @@ -421,7 +421,7 @@ money64 Ride::CalculateIncomePerHour() const * dl ride index * esi result map element */ -bool ride_try_get_origin_element(const Ride& ride, CoordsXYE* output) +bool RideTryGetOriginElement(const Ride& ride, CoordsXYE* output) { TileElement* resultTileElement = nullptr; @@ -473,7 +473,7 @@ bool ride_try_get_origin_element(const Ride& ride, CoordsXYE* output) * Use track_block_get_next if you are unsure if you are * on the first element of a track block */ -bool track_block_get_next_from_zero( +bool TrackBlockGetNextFromZero( const CoordsXYZ& startPos, const Ride& ride, uint8_t direction_start, CoordsXYE* output, int32_t* z, int32_t* direction, bool isGhost) { @@ -543,7 +543,7 @@ bool track_block_get_next_from_zero( * * rct2: 0x006C60C2 */ -bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* direction) +bool TrackBlockGetNext(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* direction) { if (input == nullptr || input->element == nullptr) return false; @@ -553,7 +553,7 @@ bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32 return false; auto rideIndex = inputElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -582,7 +582,7 @@ bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32 uint8_t directionStart = ((trackCoordinate.rotation_end + rotation) & TILE_ELEMENT_DIRECTION_MASK) | (trackCoordinate.rotation_end & TRACK_BLOCK_2); - return track_block_get_next_from_zero({ coords, OriginZ }, *ride, directionStart, output, z, direction, false); + return TrackBlockGetNextFromZero({ coords, OriginZ }, *ride, directionStart, output, z, direction, false); } /** @@ -593,7 +593,7 @@ bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32 * element of a track block * rct2: 0x006C63D6 */ -bool track_block_get_previous_from_zero( +bool TrackBlockGetPreviousFromZero( const CoordsXYZ& startPos, const Ride& ride, uint8_t direction, track_begin_end* outTrackBeginEnd) { uint8_t directionStart = direction; @@ -686,7 +686,7 @@ bool track_block_get_previous_from_zero( * higher two bytes of ecx and edx where as outTrackBeginEnd.end_x and * outTrackBeginEnd.end_y will be in the lower two bytes (cx and dx). */ -bool track_block_get_previous(const CoordsXYE& trackPos, track_begin_end* outTrackBeginEnd) +bool TrackBlockGetPrevious(const CoordsXYE& trackPos, track_begin_end* outTrackBeginEnd) { if (trackPos.element == nullptr) return false; @@ -698,7 +698,7 @@ bool track_block_get_previous(const CoordsXYE& trackPos, track_begin_end* outTra const auto& ted = GetTrackElementDescriptor(trackElement->GetTrackType()); auto rideIndex = trackElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -721,7 +721,7 @@ bool track_block_get_previous(const CoordsXYE& trackPos, track_begin_end* outTra rotation = ((trackCoordinate.rotation_begin + rotation) & TILE_ELEMENT_DIRECTION_MASK) | (trackCoordinate.rotation_begin & TRACK_BLOCK_2); - return track_block_get_previous_from_zero({ coords, z }, *ride, rotation, outTrackBeginEnd); + return TrackBlockGetPreviousFromZero({ coords, z }, *ride, rotation, outTrackBeginEnd); } /** @@ -744,16 +744,16 @@ bool Ride::FindTrackGap(const CoordsXYE& input, CoordsXYE* output) const rct_window* w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == id) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); } bool moveSlowIt = true; track_circuit_iterator it = {}; - track_circuit_iterator_begin(&it, input); + TrackCircuitIteratorBegin(&it, input); track_circuit_iterator slowIt = it; - while (track_circuit_iterator_next(&it)) + while (TrackCircuitIteratorNext(&it)) { - if (!track_is_connected_by_shape(it.last.element, it.current.element)) + if (!TrackIsConnectedByShape(it.last.element, it.current.element)) { *output = it.current; return true; @@ -762,8 +762,8 @@ bool Ride::FindTrackGap(const CoordsXYE& input, CoordsXYE* output) const moveSlowIt = !moveSlowIt; if (moveSlowIt) { - track_circuit_iterator_next(&slowIt); - if (track_circuit_iterators_match(&it, &slowIt)) + TrackCircuitIteratorNext(&slowIt); + if (TrackCircuitIteratorsMatch(&it, &slowIt)) { *output = it.current; return true; @@ -902,7 +902,7 @@ bool Ride::SupportsStatus(RideStatus s) const * * rct2: 0x006ACA89 */ -void ride_init_all() +void RideInitAll() { _rides.clear(); _rides.shrink_to_fit(); @@ -912,7 +912,7 @@ void ride_init_all() * * rct2: 0x006B7A38 */ -void reset_all_ride_build_dates() +void ResetAllRideBuildDates() { for (auto& ride : GetRideManager()) { @@ -975,7 +975,7 @@ std::unique_ptr Ride::SaveToTrackDesign(TrackDesignState& tds) cons return nullptr; } - if (!ride_has_ratings(*this)) + if (!RideHasRatings(*this)) { ContextShowError(STR_CANT_SAVE_TRACK_DESIGN, STR_NONE, {}); return nullptr; @@ -1038,7 +1038,7 @@ void Ride::Update() const auto& rtd = GetRideTypeDescriptor(); if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_MAZE)) for (StationIndex::UnderlyingType i = 0; i < OpenRCT2::Limits::MaxStationsPerRide; i++) - ride_update_station(*this, StationIndex::FromUnderlying(i)); + RideUpdateStation(*this, StationIndex::FromUnderlying(i)); // Update financial statistics num_customers_timeout++; @@ -1229,7 +1229,7 @@ void UpdateSpiralSlide(Ride& ride) auto startLoc = ride.stations[i].Start; - TileElement* tileElement = ride_get_station_start_track_element(ride, StationIndex::FromUnderlying(i)); + TileElement* tileElement = RideGetStationStartTrackElement(ride, StationIndex::FromUnderlying(i)); if (tileElement == nullptr) continue; @@ -1293,7 +1293,7 @@ static void ride_inspection_update(Ride& ride) ride.lifecycle_flags |= RIDE_LIFECYCLE_DUE_INSPECTION; ride.mechanic_status = RIDE_MECHANIC_STATUS_CALLING; - auto stationIndex = ride_get_first_valid_station_exit(ride); + auto stationIndex = RideGetFirstValidStationExit(ride); ride.inspection_station = (!stationIndex.IsNull()) ? stationIndex : StationIndex::FromUnderlying(0); } @@ -1383,7 +1383,7 @@ static void ride_breakdown_update(Ride& ride) { int32_t breakdownReason = ride_get_new_breakdown_problem(ride); if (breakdownReason != -1) - ride_prepare_breakdown(ride, breakdownReason); + RidePrepareBreakdown(ride, breakdownReason); } } @@ -1479,7 +1479,7 @@ static void choose_random_train_to_breakdown_safe(Ride& ride) * * rct2: 0x006B7348 */ -void ride_prepare_breakdown(Ride& ride, int32_t breakdownReason) +void RidePrepareBreakdown(Ride& ride, int32_t breakdownReason) { StationIndex i; Vehicle* vehicle; @@ -1499,7 +1499,7 @@ void ride_prepare_breakdown(Ride& ride, int32_t breakdownReason) case BREAKDOWN_SAFETY_CUT_OUT: case BREAKDOWN_CONTROL_FAILURE: // Inspect first station with an exit - i = ride_get_first_valid_station_exit(ride); + i = RideGetFirstValidStationExit(ride); if (!i.IsNull()) { ride.inspection_station = i; @@ -1543,7 +1543,7 @@ void ride_prepare_breakdown(Ride& ride, int32_t breakdownReason) case BREAKDOWN_BRAKES_FAILURE: // Original code generates a random number but does not use it // Unsure if this was supposed to choose a random station (or random station with an exit) - i = ride_get_first_valid_station_exit(ride); + i = RideGetFirstValidStationExit(ride); if (!i.IsNull()) { ride.inspection_station = i; @@ -1556,7 +1556,7 @@ void ride_prepare_breakdown(Ride& ride, int32_t breakdownReason) * * rct2: 0x006B74FA */ -void ride_breakdown_add_news_item(const Ride& ride) +void RideBreakdownAddNewsItem(const Ride& ride) { if (gConfigNotifications.RideBrokenDown) { @@ -1616,7 +1616,7 @@ static void ride_mechanic_status_update(Ride& ride, int32_t mechanicStatus) ride.window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE | RIDE_INVALIDATE_RIDE_LIST | RIDE_INVALIDATE_RIDE_MAIN; ride.breakdown_reason = breakdownReason; - ride_breakdown_add_news_item(ride); + RideBreakdownAddNewsItem(ride); } } switch (mechanicStatus) @@ -1639,7 +1639,7 @@ static void ride_mechanic_status_update(Ride& ride, int32_t mechanicStatus) break; case RIDE_MECHANIC_STATUS_HEADING: { - auto mechanic = ride_get_mechanic(ride); + auto mechanic = RideGetMechanic(ride); bool rideNeedsRepair = (ride.lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN)); if (mechanic == nullptr || (mechanic->State != PeepState::HeadingToInspection && mechanic->State != PeepState::Answering) @@ -1660,7 +1660,7 @@ static void ride_mechanic_status_update(Ride& ride, int32_t mechanicStatus) } case RIDE_MECHANIC_STATUS_FIXING: { - auto mechanic = ride_get_mechanic(ride); + auto mechanic = RideGetMechanic(ride); if (mechanic == nullptr || (mechanic->State != PeepState::HeadingToInspection && mechanic->State != PeepState::Fixing && mechanic->State != PeepState::Inspecting && mechanic->State != PeepState::Answering)) @@ -1696,12 +1696,12 @@ static void ride_call_mechanic(Ride& ride, Peep* mechanic, int32_t forInspection static void ride_call_closest_mechanic(Ride& ride) { auto forInspection = (ride.lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN)) == 0; - auto mechanic = ride_find_closest_mechanic(ride, forInspection); + auto mechanic = RideFindClosestMechanic(ride, forInspection); if (mechanic != nullptr) ride_call_mechanic(ride, mechanic, forInspection); } -Staff* ride_find_closest_mechanic(const Ride& ride, int32_t forInspection) +Staff* RideFindClosestMechanic(const Ride& ride, int32_t forInspection) { // Get either exit position or entrance position if there is no exit auto& station = ride.GetStation(ride.inspection_station); @@ -1715,7 +1715,7 @@ Staff* ride_find_closest_mechanic(const Ride& ride, int32_t forInspection) // Get station start track element and position auto mapLocation = location.ToCoordsXYZ(); - TileElement* tileElement = ride_get_station_exit_element(mapLocation); + TileElement* tileElement = RideGetStationExitElement(mapLocation); if (tileElement == nullptr) return nullptr; @@ -1779,7 +1779,7 @@ Staff* find_closest_mechanic(const CoordsXY& entrancePosition, int32_t forInspec return closestMechanic; } -Staff* ride_get_mechanic(const Ride& ride) +Staff* RideGetMechanic(const Ride& ride) { auto staff = GetEntity(ride.mechanic); if (staff != nullptr && staff->IsMechanic()) @@ -1789,14 +1789,14 @@ Staff* ride_get_mechanic(const Ride& ride) return nullptr; } -Staff* ride_get_assigned_mechanic(const Ride& ride) +Staff* RideGetAssignedMechanic(const Ride& ride) { if (ride.lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) { if (ride.mechanic_status == RIDE_MECHANIC_STATUS_HEADING || ride.mechanic_status == RIDE_MECHANIC_STATUS_FIXING || ride.mechanic_status == RIDE_MECHANIC_STATUS_HAS_FIXED_STATION_BRAKES) { - return ride_get_mechanic(ride); + return RideGetMechanic(ride); } } @@ -2016,7 +2016,7 @@ static void ride_measurement_update(Ride& ride, RideMeasurement& measurement) * * rct2: 0x006B6456 */ -void ride_measurements_update() +void RideMeasurementsUpdate() { PROFILED_FUNCTION(); @@ -2126,7 +2126,7 @@ std::pair Ride::GetMeasurement() #pragma region Colour functions -VehicleColour ride_get_vehicle_colour(const Ride& ride, int32_t vehicleIndex) +VehicleColour RideGetVehicleColour(const Ride& ride, int32_t vehicleIndex) { // Prevent indexing array out of bounds vehicleIndex = std::min(vehicleIndex, OpenRCT2::Limits::MaxCarsPerTrain); @@ -2146,7 +2146,7 @@ static bool RideTypeVehicleColourExists(ObjectEntryIndex subType, const VehicleC return false; } -int32_t ride_get_unused_preset_vehicle_colour(ObjectEntryIndex subType) +int32_t RideGetUnusedPresetVehicleColour(ObjectEntryIndex subType) { const auto* rideEntry = get_ride_entry(subType); if (rideEntry == nullptr) @@ -2183,7 +2183,7 @@ int32_t ride_get_unused_preset_vehicle_colour(ObjectEntryIndex subType) * * rct2: 0x006DE52C */ -void ride_set_vehicle_colours_to_random_preset(Ride& ride, uint8_t preset_index) +void RideSetVehicleColoursToRandomPreset(Ride& ride, uint8_t preset_index) { rct_ride_entry* rideEntry = get_ride_entry(ride.subtype); vehicle_colour_preset_list* presetList = rideEntry->vehicle_preset_list; @@ -2217,7 +2217,7 @@ void ride_set_vehicle_colours_to_random_preset(Ride& ride, uint8_t preset_index) * * rct2: 0x006B7A5E */ -void ride_check_all_reachable() +void RideCheckAllReachable() { for (auto& ride : GetRideManager()) { @@ -2308,7 +2308,7 @@ static void ride_shop_connected(const Ride& ride) return; auto track_type = trackElement->GetTrackType(); - auto ride2 = get_ride(trackElement->GetRideIndex()); + auto ride2 = GetRide(trackElement->GetRideIndex()); if (ride2 == nullptr) { return; @@ -2360,7 +2360,7 @@ static void ride_shop_connected(const Ride& ride) static void ride_track_set_map_tooltip(TileElement* tileElement) { auto rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { auto ft = Formatter(); @@ -2376,7 +2376,7 @@ static void ride_track_set_map_tooltip(TileElement* tileElement) static void ride_queue_banner_set_map_tooltip(TileElement* tileElement) { auto rideIndex = tileElement->AsPath()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { auto ft = Formatter(); @@ -2392,7 +2392,7 @@ static void ride_queue_banner_set_map_tooltip(TileElement* tileElement) static void ride_station_set_map_tooltip(TileElement* tileElement) { auto rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { auto stationIndex = tileElement->AsTrack()->GetStationIndex(); @@ -2416,7 +2416,7 @@ static void ride_station_set_map_tooltip(TileElement* tileElement) static void ride_entrance_set_map_tooltip(TileElement* tileElement) { auto rideIndex = tileElement->AsEntrance()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { // Get the station @@ -2481,7 +2481,7 @@ static void ride_entrance_set_map_tooltip(TileElement* tileElement) } } -void ride_set_map_tooltip(TileElement* tileElement) +void RideSetMapTooltip(TileElement* tileElement) { if (tileElement->GetType() == TileElementType::Entrance) { @@ -2554,7 +2554,7 @@ static ResultWithMessage ride_mode_check_valid_station_numbers(const Ride& ride) */ static StationIndexWithMessage ride_mode_check_station_present(const Ride& ride) { - auto stationIndex = ride_get_first_valid_station_start(ride); + auto stationIndex = RideGetFirstValidStationStart(ride); if (stationIndex.IsNull()) { @@ -2577,7 +2577,7 @@ static StationIndexWithMessage ride_mode_check_station_present(const Ride& ride) */ static ResultWithMessage ride_check_for_entrance_exit(RideId rideIndex) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return { false }; @@ -2667,11 +2667,11 @@ static ResultWithMessage RideCheckBlockBrakes(const CoordsXYE& input, CoordsXYE* RideId rideIndex = input.element->AsTrack()->GetRideIndex(); rct_window* w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == rideIndex) - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); track_circuit_iterator it; - track_circuit_iterator_begin(&it, input); - while (track_circuit_iterator_next(&it)) + TrackCircuitIteratorBegin(&it, input); + while (TrackCircuitIteratorNext(&it)) { if (it.current.element->AsTrack()->GetTrackType() == TrackElemType::BlockBrakes) { @@ -2721,7 +2721,7 @@ static bool ride_check_track_contains_inversions(const CoordsXYE& input, CoordsX return false; RideId rideIndex = trackElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { const auto& rtd = ride->GetRideTypeDescriptor(); @@ -2732,15 +2732,15 @@ static bool ride_check_track_contains_inversions(const CoordsXYE& input, CoordsX rct_window* w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && rideIndex == _currentRideIndex) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); } bool moveSlowIt = true; track_circuit_iterator it, slowIt; - track_circuit_iterator_begin(&it, input); + TrackCircuitIteratorBegin(&it, input); slowIt = it; - while (track_circuit_iterator_next(&it)) + while (TrackCircuitIteratorNext(&it)) { auto trackType = it.current.element->AsTrack()->GetTrackType(); const auto& ted = GetTrackElementDescriptor(trackType); @@ -2754,8 +2754,8 @@ static bool ride_check_track_contains_inversions(const CoordsXYE& input, CoordsX moveSlowIt = !moveSlowIt; if (moveSlowIt) { - track_circuit_iterator_next(&slowIt); - if (track_circuit_iterators_match(&it, &slowIt)) + TrackCircuitIteratorNext(&slowIt); + if (TrackCircuitIteratorsMatch(&it, &slowIt)) { return false; } @@ -2781,7 +2781,7 @@ static bool ride_check_track_contains_banked(const CoordsXYE& input, CoordsXYE* return false; auto rideIndex = trackElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -2792,15 +2792,15 @@ static bool ride_check_track_contains_banked(const CoordsXYE& input, CoordsXYE* rct_window* w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && rideIndex == _currentRideIndex) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); } bool moveSlowIt = true; track_circuit_iterator it, slowIt; - track_circuit_iterator_begin(&it, input); + TrackCircuitIteratorBegin(&it, input); slowIt = it; - while (track_circuit_iterator_next(&it)) + while (TrackCircuitIteratorNext(&it)) { auto trackType = output->element->AsTrack()->GetTrackType(); const auto& ted = GetTrackElementDescriptor(trackType); @@ -2814,8 +2814,8 @@ static bool ride_check_track_contains_banked(const CoordsXYE& input, CoordsXYE* moveSlowIt = !moveSlowIt; if (moveSlowIt) { - track_circuit_iterator_next(&slowIt); - if (track_circuit_iterators_match(&it, &slowIt)) + TrackCircuitIteratorNext(&slowIt); + if (TrackCircuitIteratorsMatch(&it, &slowIt)) { return false; } @@ -2834,14 +2834,14 @@ static int32_t ride_check_station_length(const CoordsXYE& input, CoordsXYE* outp if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == input.element->AsTrack()->GetRideIndex()) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); } output->x = input.x; output->y = input.y; output->element = input.element; track_begin_end trackBeginEnd; - while (track_block_get_previous(*output, &trackBeginEnd)) + while (TrackBlockGetPrevious(*output, &trackBeginEnd)) { output->x = trackBeginEnd.begin_x; output->y = trackBeginEnd.begin_y; @@ -2869,7 +2869,7 @@ static int32_t ride_check_station_length(const CoordsXYE& input, CoordsXYE* outp } num_station_elements = 0; } - } while (track_block_get_next(output, output, nullptr, nullptr)); + } while (TrackBlockGetNext(output, output, nullptr, nullptr)); // Prevent returning a pointer to a map element with no track. *output = last_good_station; @@ -2888,18 +2888,18 @@ static bool ride_check_start_and_end_is_station(const CoordsXYE& input) CoordsXYE trackBack, trackFront; RideId rideIndex = input.element->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; auto w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && rideIndex == _currentRideIndex) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); } // Check back of the track - track_get_back(input, &trackBack); + TrackGetBack(input, &trackBack); auto trackType = trackBack.element->AsTrack()->GetTrackType(); const auto* ted = &GetTrackElementDescriptor(trackType); if (!(std::get<0>(ted->SequenceProperties) & TRACK_SEQUENCE_FLAG_ORIGIN)) @@ -2909,7 +2909,7 @@ static bool ride_check_start_and_end_is_station(const CoordsXYE& input) ride->ChairliftBullwheelLocation[0] = TileCoordsXYZ{ CoordsXYZ{ trackBack.x, trackBack.y, trackBack.element->GetBaseZ() } }; // Check front of the track - track_get_front(input, &trackFront); + TrackGetFront(input, &trackFront); trackType = trackFront.element->AsTrack()->GetTrackType(); ted = &GetTrackElementDescriptor(trackType); if (!(std::get<0>(ted->SequenceProperties) & TRACK_SEQUENCE_FLAG_ORIGIN)) @@ -2933,7 +2933,7 @@ static void ride_set_boat_hire_return_point(Ride& ride, const CoordsXYE& startEl int32_t startX = returnPos.x; int32_t startY = returnPos.y; track_begin_end trackBeginEnd; - while (track_block_get_previous(returnPos, &trackBeginEnd)) + while (TrackBlockGetPrevious(returnPos, &trackBeginEnd)) { // If previous track is back to the starting x, y, then break loop (otherwise possible infinite loop) if (trackType != -1 && startX == trackBeginEnd.begin_x && startY == trackBeginEnd.begin_y) @@ -3026,7 +3026,7 @@ static void RideOpenBlockBrakes(const CoordsXYE& startElement) currentElement.element->AsTrack()->SetBrakeClosed(false); break; } - } while (track_block_get_next(¤tElement, ¤tElement, nullptr, nullptr) + } while (TrackBlockGetNext(¤tElement, ¤tElement, nullptr, nullptr) && currentElement.element != startElement.element); } @@ -3036,7 +3036,7 @@ static void RideOpenBlockBrakes(const CoordsXYE& startElement) */ static void ride_set_start_finish_points(RideId rideIndex, const CoordsXYE& startElement) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return; @@ -3095,7 +3095,7 @@ static Vehicle* vehicle_create_car( if (trackElement == nullptr) return nullptr; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return nullptr; @@ -3296,12 +3296,12 @@ static train_ref vehicle_create_train( RideId rideIndex, const CoordsXYZ& trainPos, int32_t vehicleIndex, int32_t* remainingDistance, TrackElement* trackElement) { train_ref train = { nullptr, nullptr }; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr) { for (int32_t carIndex = 0; carIndex < ride->num_cars_per_train; carIndex++) { - auto vehicle = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, carIndex); + auto vehicle = RideEntryGetVehicleAtPosition(ride->subtype, ride->num_cars_per_train, carIndex); auto car = vehicle_create_car( rideIndex, vehicle, carIndex, vehicleIndex, trainPos, remainingDistance, trackElement); if (car == nullptr) @@ -3326,7 +3326,7 @@ static train_ref vehicle_create_train( static bool vehicle_create_trains(RideId rideIndex, const CoordsXYZ& trainsPos, TrackElement* trackElement) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -3397,7 +3397,7 @@ static void ride_create_vehicles_find_first_block(const Ride& ride, CoordsXYE* o CoordsXY trackPos = curTrackPos; auto trackElement = curTrackElement; track_begin_end trackBeginEnd; - while (track_block_get_previous({ trackPos, reinterpret_cast(trackElement) }, &trackBeginEnd)) + while (TrackBlockGetPrevious({ trackPos, reinterpret_cast(trackElement) }, &trackBeginEnd)) { trackPos = { trackBeginEnd.end_x, trackBeginEnd.end_y }; trackElement = trackBeginEnd.begin_element->AsTrack(); @@ -3531,7 +3531,7 @@ ResultWithMessage Ride::CreateVehicles(const CoordsXYE& element, bool isApplying } } } - ride_update_vehicle_colours(*this); + RideUpdateVehicleColours(*this); return { true }; } @@ -3648,8 +3648,8 @@ static ResultWithMessage ride_initialise_cable_lift_track(const Ride& ride, bool int32_t state = STATE_FIND_CABLE_LIFT; track_circuit_iterator it; - track_circuit_iterator_begin(&it, { location, tileElement }); - while (track_circuit_iterator_previous(&it)) + TrackCircuitIteratorBegin(&it, { location, tileElement }); + while (TrackCircuitIteratorPrevious(&it)) { tileElement = it.current.element; auto trackType = tileElement->AsTrack()->GetTrackType(); @@ -3704,7 +3704,7 @@ static ResultWithMessage ride_initialise_cable_lift_track(const Ride& ride, bool */ static ResultWithMessage ride_create_cable_lift(RideId rideIndex, bool isApplying) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return { false }; @@ -3750,7 +3750,7 @@ static ResultWithMessage ride_create_cable_lift(RideId rideIndex, bool isApplyin int32_t remaining_distance = ebx; ebx -= edx; - Vehicle* current = cable_lift_segment_create( + Vehicle* current = CableLiftSegmentCreate( *ride, cableLiftLoc.x, cableLiftLoc.y, cableLiftLoc.z / 8, direction, var_44, remaining_distance, i == 0); current->next_vehicle_on_train = EntityId::GetNull(); if (i == 0) @@ -3818,9 +3818,9 @@ void Ride::ConstructMissingEntranceOrExit() const WindowScrollToLocation(*w, location); CoordsXYE trackElement; - ride_try_get_origin_element(*this, &trackElement); + RideTryGetOriginElement(*this, &trackElement); FindTrackGap(trackElement, &trackElement); - int32_t ok = ride_modify(trackElement); + int32_t ok = RideModify(trackElement); if (ok == 0) { return; @@ -3845,7 +3845,7 @@ static void ride_scroll_to_track_error(const CoordsXYE& trackElement) if (w != nullptr) { WindowScrollToLocation(*w, { trackElement, trackElement.element->GetBaseZ() }); - ride_modify(trackElement); + RideModify(trackElement); } } @@ -4021,11 +4021,11 @@ ResultWithMessage Ride::Open(bool isApplying) * Given a track element of the ride, find the start of the track. * It has to do this as a backwards loop in case this is an incomplete track. */ -void ride_get_start_of_track(CoordsXYE* output) +void RideGetStartOfTrack(CoordsXYE* output) { track_begin_end trackBeginEnd; CoordsXYE trackElement = *output; - if (track_block_get_previous(trackElement, &trackBeginEnd)) + if (TrackBlockGetPrevious(trackElement, &trackBeginEnd)) { TileElement* initial_map = trackElement.element; track_begin_end slowIt = trackBeginEnd; @@ -4041,7 +4041,7 @@ void ride_get_start_of_track(CoordsXYE* output) /* .element = */ trackBeginEnd.begin_element, }; - if (!track_block_get_previous( + if (!TrackBlockGetPrevious( { trackBeginEnd.end_x, trackBeginEnd.end_y, trackBeginEnd.begin_element }, &trackBeginEnd)) { trackElement = lastGood; @@ -4051,7 +4051,7 @@ void ride_get_start_of_track(CoordsXYE* output) moveSlowIt = !moveSlowIt; if (moveSlowIt) { - if (!track_block_get_previous({ slowIt.end_x, slowIt.end_y, slowIt.begin_element }, &slowIt) + if (!TrackBlockGetPrevious({ slowIt.end_x, slowIt.end_y, slowIt.begin_element }, &slowIt) || slowIt.begin_element == trackBeginEnd.begin_element) { break; @@ -4113,7 +4113,7 @@ bool Ride::NameExists(std::string_view name, RideId excludeRideId) Formatter ft; ride.FormatNameTo(ft); format_string(buffer, 256, STR_STRINGID, ft.Data()); - if (name == buffer && ride_has_any_track_elements(ride)) + if (name == buffer && RideHasAnyTrackElements(ride)) { return true; } @@ -4122,7 +4122,7 @@ bool Ride::NameExists(std::string_view name, RideId excludeRideId) return false; } -int32_t ride_get_random_colour_preset_index(ride_type_t rideType) +int32_t RideGetRandomColourPresetIndex(ride_type_t rideType) { if (rideType >= std::size(RideTypeDescriptors)) { @@ -4182,7 +4182,7 @@ void Ride::SetColourPreset(uint8_t index) colour_scheme_type = 0; } -money32 ride_get_common_price(const Ride& forRide) +money32 RideGetCommonPrice(const Ride& forRide) { for (const auto& ride : GetRideManager()) { @@ -4214,7 +4214,7 @@ void Ride::SetNameToDefault() /** * This will return the name of the ride, as seen in the New Ride window. */ -RideNaming get_ride_naming(const ride_type_t rideType, const rct_ride_entry& rideEntry) +RideNaming GetRideNaming(const ride_type_t rideType, const rct_ride_entry& rideEntry) { if (!GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { @@ -4238,7 +4238,7 @@ RideNaming get_ride_naming(const ride_type_t rideType, const rct_ride_entry& rid * if by some miracle you manage 4 element none sloped. */ -void increment_turn_count_1_element(Ride& ride, uint8_t type) +void IncrementTurnCount1Element(Ride& ride, uint8_t type) { uint16_t* turn_count; switch (type) @@ -4263,7 +4263,7 @@ void increment_turn_count_1_element(Ride& ride, uint8_t type) *turn_count |= value; } -void increment_turn_count_2_elements(Ride& ride, uint8_t type) +void IncrementTurnCount2Elements(Ride& ride, uint8_t type) { uint16_t* turn_count; switch (type) @@ -4288,7 +4288,7 @@ void increment_turn_count_2_elements(Ride& ride, uint8_t type) *turn_count |= value; } -void increment_turn_count_3_elements(Ride& ride, uint8_t type) +void IncrementTurnCount3Elements(Ride& ride, uint8_t type) { uint16_t* turn_count; switch (type) @@ -4313,7 +4313,7 @@ void increment_turn_count_3_elements(Ride& ride, uint8_t type) *turn_count |= value; } -void increment_turn_count_4_plus_elements(Ride& ride, uint8_t type) +void IncrementTurnCount4PlusElements(Ride& ride, uint8_t type) { uint16_t* turn_count; switch (type) @@ -4321,7 +4321,7 @@ void increment_turn_count_4_plus_elements(Ride& ride, uint8_t type) case 0: case 1: // Just in case fallback to 3 element turn - increment_turn_count_3_elements(ride, type); + IncrementTurnCount3Elements(ride, type); return; case 2: turn_count = &ride.turn_count_sloped; @@ -4337,7 +4337,7 @@ void increment_turn_count_4_plus_elements(Ride& ride, uint8_t type) *turn_count |= value; } -int32_t get_turn_count_1_element(const Ride& ride, uint8_t type) +int32_t GetTurnCount1Element(const Ride& ride, uint8_t type) { const uint16_t* turn_count; switch (type) @@ -4358,7 +4358,7 @@ int32_t get_turn_count_1_element(const Ride& ride, uint8_t type) return (*turn_count) & TURN_MASK_1_ELEMENT; } -int32_t get_turn_count_2_elements(const Ride& ride, uint8_t type) +int32_t GetTurnCount2Elements(const Ride& ride, uint8_t type) { const uint16_t* turn_count; switch (type) @@ -4379,7 +4379,7 @@ int32_t get_turn_count_2_elements(const Ride& ride, uint8_t type) return ((*turn_count) & TURN_MASK_2_ELEMENTS) >> 5; } -int32_t get_turn_count_3_elements(const Ride& ride, uint8_t type) +int32_t GetTurnCount3Elements(const Ride& ride, uint8_t type) { const uint16_t* turn_count; switch (type) @@ -4400,7 +4400,7 @@ int32_t get_turn_count_3_elements(const Ride& ride, uint8_t type) return ((*turn_count) & TURN_MASK_3_ELEMENTS) >> 8; } -int32_t get_turn_count_4_plus_elements(const Ride& ride, uint8_t type) +int32_t GetTurnCount4PlusElements(const Ride& ride, uint8_t type) { const uint16_t* turn_count; switch (type) @@ -4448,7 +4448,7 @@ bool Ride::HasWhirlpool() const return special_track_elements & RIDE_ELEMENT_WHIRLPOOL; } -uint8_t ride_get_helix_sections(const Ride& ride) +uint8_t RideGetHelixSections(const Ride& ride) { // Helix sections stored in the low 5 bits. return ride.special_track_elements & 0x1F; @@ -4465,7 +4465,7 @@ bool Ride::IsBlockSectioned() const return mode == RideMode::ContinuousCircuitBlockSectioned || mode == RideMode::PoweredLaunchBlockSectioned; } -bool ride_has_any_track_elements(const Ride& ride) +bool RideHasAnyTrackElements(const Ride& ride) { tile_element_iterator it; @@ -4489,7 +4489,7 @@ bool ride_has_any_track_elements(const Ride& ride) * * rct2: 0x006B59C6 */ -void invalidate_test_results(Ride& ride) +void InvalidateTestResults(Ride& ride) { ride.measurement = {}; ride.excitement = RIDE_RATING_UNDEFINED; @@ -4516,7 +4516,7 @@ void invalidate_test_results(Ride& ride) * @param rideIndex (dl) * @param reliabilityIncreaseFactor (ax) */ -void ride_fix_breakdown(Ride& ride, int32_t reliabilityIncreaseFactor) +void RideFixBreakdown(Ride& ride, int32_t reliabilityIncreaseFactor) { ride.lifecycle_flags &= ~RIDE_LIFECYCLE_BREAKDOWN_PENDING; ride.lifecycle_flags &= ~RIDE_LIFECYCLE_BROKEN_DOWN; @@ -4545,7 +4545,7 @@ void ride_fix_breakdown(Ride& ride, int32_t reliabilityIncreaseFactor) * * rct2: 0x006DE102 */ -void ride_update_vehicle_colours(const Ride& ride) +void RideUpdateVehicleColours(const Ride& ride) { if (ride.type == RIDE_TYPE_SPACE_RINGS || ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL)) { @@ -4580,7 +4580,7 @@ void ride_update_vehicle_colours(const Ride& ride) } } -uint8_t ride_entry_get_vehicle_at_position(int32_t rideEntryIndex, int32_t numCarsPerTrain, int32_t position) +uint8_t RideEntryGetVehicleAtPosition(int32_t rideEntryIndex, int32_t numCarsPerTrain, int32_t position) { rct_ride_entry* rideEntry = get_ride_entry(rideEntryIndex); if (position == 0 && rideEntry->FrontCar != 255) @@ -4612,7 +4612,7 @@ struct NecessarySpriteGroup }; // Finds track pieces that a given ride entry has sprites for -OpenRCT2::BitSet ride_entry_get_supported_track_pieces(const rct_ride_entry& rideEntry) +OpenRCT2::BitSet RideEntryGetSupportedTrackPieces(const rct_ride_entry& rideEntry) { // TODO: Use a std::span when C++20 available as 6 is due to jagged array static const std::array trackPieceRequiredSprites[TRACK_GROUP_COUNT] = { @@ -4839,17 +4839,17 @@ static int32_t ride_get_track_length(const Ride& ride) rct_window* w = WindowFindByClass(WindowClass::RideConstruction); if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == rideIndex) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); } bool moveSlowIt = true; int32_t result = 0; track_circuit_iterator it; - track_circuit_iterator_begin(&it, { trackStart.x, trackStart.y, tileElement }); + TrackCircuitIteratorBegin(&it, { trackStart.x, trackStart.y, tileElement }); track_circuit_iterator slowIt = it; - while (track_circuit_iterator_next(&it)) + while (TrackCircuitIteratorNext(&it)) { trackType = it.current.element->AsTrack()->GetTrackType(); const auto& ted = GetTrackElementDescriptor(trackType); @@ -4858,8 +4858,8 @@ static int32_t ride_get_track_length(const Ride& ride) moveSlowIt = !moveSlowIt; if (moveSlowIt) { - track_circuit_iterator_next(&slowIt); - if (track_circuit_iterators_match(&it, &slowIt)) + TrackCircuitIteratorNext(&slowIt); + if (TrackCircuitIteratorsMatch(&it, &slowIt)) { return 0; } @@ -4907,7 +4907,7 @@ void Ride::UpdateMaxVehicles() int32_t totalMass = 0; for (int32_t i = 0; i < numCars; i++) { - carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position(subtype, numCars, i)]; + carEntry = &rideEntry->Cars[RideEntryGetVehicleAtPosition(subtype, numCars, i)]; trainLength += carEntry->spacing; totalMass += carEntry->car_mass; } @@ -4945,7 +4945,7 @@ void Ride::UpdateMaxVehicles() trainLength = 0; for (int32_t i = 0; i < newCarsPerTrain; i++) { - carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position(subtype, newCarsPerTrain, i)]; + carEntry = &rideEntry->Cars[RideEntryGetVehicleAtPosition(subtype, newCarsPerTrain, i)]; trainLength += carEntry->spacing; } @@ -4967,13 +4967,13 @@ void Ride::UpdateMaxVehicles() } else { - carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position(subtype, newCarsPerTrain, 0)]; + carEntry = &rideEntry->Cars[RideEntryGetVehicleAtPosition(subtype, newCarsPerTrain, 0)]; int32_t poweredMaxSpeed = carEntry->powered_max_speed; int32_t totalSpacing = 0; for (int32_t i = 0; i < newCarsPerTrain; i++) { - carEntry = &rideEntry->Cars[ride_entry_get_vehicle_at_position(subtype, newCarsPerTrain, i)]; + carEntry = &rideEntry->Cars[RideEntryGetVehicleAtPosition(subtype, newCarsPerTrain, i)]; totalSpacing += carEntry->spacing; } @@ -5034,7 +5034,7 @@ void Ride::UpdateNumberOfCircuits() void Ride::SetRideEntry(ObjectEntryIndex entryIndex) { - auto colour = ride_get_unused_preset_vehicle_colour(entryIndex); + auto colour = RideGetUnusedPresetVehicleColour(entryIndex); auto rideSetVehicleAction = RideSetVehicleAction(id, RideSetVehicleType::RideEntry, entryIndex, colour); GameActions::Execute(&rideSetVehicleAction); } @@ -5058,7 +5058,7 @@ void Ride::SetToDefaultInspectionInterval() { if (defaultInspectionInterval <= RIDE_INSPECTION_NEVER) { - set_operating_setting(id, RideSetSetting::InspectionInterval, defaultInspectionInterval); + SetOperatingSetting(id, RideSetSetting::InspectionInterval, defaultInspectionInterval); } } } @@ -5094,13 +5094,13 @@ void Ride::Crash(uint8_t vehicleIndex) } // Gets the approximate value of customers per hour for this ride. Multiplies ride_customers_in_last_5_minutes() by 12. -uint32_t ride_customers_per_hour(const Ride& ride) +uint32_t RideCustomersPerHour(const Ride& ride) { - return ride_customers_in_last_5_minutes(ride) * 12; + return RideCustomersInLast5Minutes(ride) * 12; } // Calculates the number of customers for this ride in the last 5 minutes (or more correctly 9600 game ticks) -uint32_t ride_customers_in_last_5_minutes(const Ride& ride) +uint32_t RideCustomersInLast5Minutes(const Ride& ride) { uint32_t sum = 0; @@ -5112,7 +5112,7 @@ uint32_t ride_customers_in_last_5_minutes(const Ride& ride) return sum; } -Vehicle* ride_get_broken_vehicle(const Ride& ride) +Vehicle* RideGetBrokenVehicle(const Ride& ride) { auto vehicleIndex = ride.vehicles[ride.broken_vehicle]; Vehicle* vehicle = GetEntity(vehicleIndex); @@ -5152,7 +5152,7 @@ bool Ride::IsRide() const return GetClassification() == RideClassification::Ride; } -money16 ride_get_price(const Ride& ride) +money16 RideGetPrice(const Ride& ride) { if (gParkFlags & PARK_FLAGS_NO_MONEY) return 0; @@ -5170,7 +5170,7 @@ money16 ride_get_price(const Ride& ride) * Return the tile_element of an adjacent station at x,y,z(+-2). * Returns nullptr if no suitable tile_element is found. */ -TileElement* get_station_platform(const CoordsXYRangedZ& coords) +TileElement* GetStationPlatform(const CoordsXYRangedZ& coords) { bool foundTileElement = false; TileElement* tileElement = MapGetFirstElementAt(coords); @@ -5215,12 +5215,12 @@ static bool check_for_adjacent_station(const CoordsXYZ& stationCoords, uint8_t d { adjX += CoordsDirectionDelta[direction].x; adjY += CoordsDirectionDelta[direction].y; - TileElement* stationElement = get_station_platform( + TileElement* stationElement = GetStationPlatform( { { adjX, adjY, stationCoords.z }, stationCoords.z + 2 * COORDS_Z_STEP }); if (stationElement != nullptr) { auto rideIndex = stationElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride != nullptr && (ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS)) { found = true; @@ -5233,7 +5233,7 @@ static bool check_for_adjacent_station(const CoordsXYZ& stationCoords, uint8_t d /** * Return whether ride has at least one adjacent station to it. */ -bool ride_has_adjacent_station(const Ride& ride) +bool RideHasAdjacentStation(const Ride& ride) { bool found = false; @@ -5245,7 +5245,7 @@ bool ride_has_adjacent_station(const Ride& ride) if (!stationStart.IsNull()) { /* Get the map element for the station start. */ - TileElement* stationElement = get_station_platform({ stationStart, stationStart.z + 0 }); + TileElement* stationElement = GetStationPlatform({ stationStart, stationStart.z + 0 }); if (stationElement == nullptr) { continue; @@ -5265,18 +5265,18 @@ bool ride_has_adjacent_station(const Ride& ride) return found; } -bool ride_has_station_shelter(const Ride& ride) +bool RideHasStationShelter(const Ride& ride) { const auto* stationObj = ride.GetStationObject(); return stationObj != nullptr && (stationObj->Flags & STATION_OBJECT_FLAGS::HAS_SHELTER); } -bool ride_has_ratings(const Ride& ride) +bool RideHasRatings(const Ride& ride) { return ride.excitement != RIDE_RATING_UNDEFINED; } -int32_t get_booster_speed(ride_type_t rideType, int32_t rawSpeed) +int32_t GetBoosterSpeed(ride_type_t rideType, int32_t rawSpeed) { int8_t shiftFactor = GetRideTypeDescriptor(rideType).OperatingSettings.BoosterSpeedFactor; if (shiftFactor == 0) @@ -5293,7 +5293,7 @@ int32_t get_booster_speed(ride_type_t rideType, int32_t rawSpeed) return (rawSpeed >> shiftFactorAbs); } -void fix_invalid_vehicle_sprite_sizes() +void FixInvalidVehicleSpriteSizes() { for (const auto& ride : GetRideManager()) { @@ -5325,13 +5325,13 @@ void fix_invalid_vehicle_sprite_sizes() } } -bool ride_entry_has_category(const rct_ride_entry& rideEntry, uint8_t category) +bool RideEntryHasCategory(const rct_ride_entry& rideEntry, uint8_t category) { auto rideType = rideEntry.GetFirstNonNullRideType(); return GetRideTypeDescriptor(rideType).Category == category; } -int32_t ride_get_entry_index(int32_t rideType, int32_t rideSubType) +int32_t RideGetEntryIndex(int32_t rideType, int32_t rideSubType) { int32_t subType = rideSubType; @@ -5386,7 +5386,7 @@ const MusicObject* Ride::GetMusicObject() const // an ever-so-slight chance two entrances/exits for the same station reside on the same tile. // In cases like this, the one at station height will be considered the "true" one. // If none exists at that height, newer and higher placed ones take precedence. -void determine_ride_entrance_and_exit_locations() +void DetermineRideEntranceAndExitLocations() { log_verbose("Inspecting ride entrance / exit locations"); @@ -5524,7 +5524,7 @@ void determine_ride_entrance_and_exit_locations() } } -void ride_clear_leftover_entrances(const Ride& ride) +void RideClearLeftoverEntrances(const Ride& ride) { for (TileCoordsXY tilePos = {}; tilePos.x < gMapSize.x; ++tilePos.x) { diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index ba51243377..9cefa6ab7b 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -914,18 +914,18 @@ enum constexpr uint32_t CONSTRUCTION_LIFT_HILL_SELECTED = 1 << 0; constexpr uint32_t CONSTRUCTION_INVERTED_TRACK_SELECTED = 1 << 1; -Ride* get_ride(RideId index); +Ride* GetRide(RideId index); struct RideManager { const Ride* operator[](RideId id) const { - return get_ride(id); + return GetRide(id); } Ride* operator[](RideId id) { - return get_ride(id); + return GetRide(id); } class Iterator @@ -1003,7 +1003,7 @@ RideManager GetRideManager(); RideId GetNextFreeRideId(); Ride* GetOrAllocateRide(RideId index); rct_ride_entry* get_ride_entry(ObjectEntryIndex index); -std::string_view get_ride_entry_name(ObjectEntryIndex index); +std::string_view GetRideEntryName(ObjectEntryIndex index); extern money16 gTotalRideValueForMoney; @@ -1011,96 +1011,96 @@ extern const StringId ColourSchemeNames[4]; extern ObjectEntryIndex gLastEntranceStyle; -int32_t ride_get_count(); -void ride_init_all(); -void reset_all_ride_build_dates(); -void ride_update_favourited_stat(); -void ride_check_all_reachable(); +int32_t RideGetCount(); +void RideInitAll(); +void ResetAllRideBuildDates(); +void RideUpdateFavouritedStat(); +void RideCheckAllReachable(); -bool ride_try_get_origin_element(const Ride& ride, CoordsXYE* output); -void ride_clear_blocked_tiles(const Ride& ride); -Staff* ride_get_mechanic(const Ride& ride); -Staff* ride_get_assigned_mechanic(const Ride& ride); -VehicleColour ride_get_vehicle_colour(const Ride& ride, int32_t vehicleIndex); -int32_t ride_get_unused_preset_vehicle_colour(ObjectEntryIndex subType); -void ride_set_vehicle_colours_to_random_preset(Ride& ride, uint8_t preset_index); -void ride_measurements_update(); -void ride_breakdown_add_news_item(const Ride& ride); -Staff* ride_find_closest_mechanic(const Ride& ride, int32_t forInspection); -int32_t ride_initialise_construction_window(Ride& ride); -void ride_set_map_tooltip(TileElement* tileElement); -void ride_prepare_breakdown(Ride& ride, int32_t breakdownReason); -TileElement* ride_get_station_start_track_element(const Ride& ride, StationIndex stationIndex); -TileElement* ride_get_station_exit_element(const CoordsXYZ& elementPos); -int32_t ride_get_refund_price(const Ride& ride); -int32_t ride_get_random_colour_preset_index(ride_type_t rideType); -money32 ride_get_common_price(const Ride& forRide); +bool RideTryGetOriginElement(const Ride& ride, CoordsXYE* output); +void RideClearBlockedTiles(const Ride& ride); +Staff* RideGetMechanic(const Ride& ride); +Staff* RideGetAssignedMechanic(const Ride& ride); +VehicleColour RideGetVehicleColour(const Ride& ride, int32_t vehicleIndex); +int32_t RideGetUnusedPresetVehicleColour(ObjectEntryIndex subType); +void RideSetVehicleColoursToRandomPreset(Ride& ride, uint8_t preset_index); +void RideMeasurementsUpdate(); +void RideBreakdownAddNewsItem(const Ride& ride); +Staff* RideFindClosestMechanic(const Ride& ride, int32_t forInspection); +int32_t RideInitialiseConstructionWindow(Ride& ride); +void RideSetMapTooltip(TileElement* tileElement); +void RidePrepareBreakdown(Ride& ride, int32_t breakdownReason); +TileElement* RideGetStationStartTrackElement(const Ride& ride, StationIndex stationIndex); +TileElement* RideGetStationExitElement(const CoordsXYZ& elementPos); +int32_t RideGetRefundPrice(const Ride& ride); +int32_t RideGetRandomColourPresetIndex(ride_type_t rideType); +money32 RideGetCommonPrice(const Ride& forRide); -void ride_clear_for_construction(Ride& ride); -void invalidate_test_results(Ride& ride); +void RideClearForConstruction(Ride& ride); +void InvalidateTestResults(Ride& ride); -void increment_turn_count_1_element(Ride& ride, uint8_t type); -void increment_turn_count_2_elements(Ride& ride, uint8_t type); -void increment_turn_count_3_elements(Ride& ride, uint8_t type); -void increment_turn_count_4_plus_elements(Ride& ride, uint8_t type); -int32_t get_turn_count_1_element(const Ride& ride, uint8_t type); -int32_t get_turn_count_2_elements(const Ride& ride, uint8_t type); -int32_t get_turn_count_3_elements(const Ride& ride, uint8_t type); -int32_t get_turn_count_4_plus_elements(const Ride& ride, uint8_t type); +void IncrementTurnCount1Element(Ride& ride, uint8_t type); +void IncrementTurnCount2Elements(Ride& ride, uint8_t type); +void IncrementTurnCount3Elements(Ride& ride, uint8_t type); +void IncrementTurnCount4PlusElements(Ride& ride, uint8_t type); +int32_t GetTurnCount1Element(const Ride& ride, uint8_t type); +int32_t GetTurnCount2Elements(const Ride& ride, uint8_t type); +int32_t GetTurnCount3Elements(const Ride& ride, uint8_t type); +int32_t GetTurnCount4PlusElements(const Ride& ride, uint8_t type); -uint8_t ride_get_helix_sections(const Ride& ride); +uint8_t RideGetHelixSections(const Ride& ride); -bool ride_has_any_track_elements(const Ride& ride); +bool RideHasAnyTrackElements(const Ride& ride); -bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* direction); -bool track_block_get_next_from_zero( +bool TrackBlockGetNext(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* direction); +bool TrackBlockGetNextFromZero( const CoordsXYZ& startPos, const Ride& ride, uint8_t direction_start, CoordsXYE* output, int32_t* z, int32_t* direction, bool isGhost); -bool track_block_get_previous(const CoordsXYE& trackPos, track_begin_end* outTrackBeginEnd); -bool track_block_get_previous_from_zero( +bool TrackBlockGetPrevious(const CoordsXYE& trackPos, track_begin_end* outTrackBeginEnd); +bool TrackBlockGetPreviousFromZero( const CoordsXYZ& startPos, const Ride& ride, uint8_t direction, track_begin_end* outTrackBeginEnd); -void ride_get_start_of_track(CoordsXYE* output); +void RideGetStartOfTrack(CoordsXYE* output); -void window_ride_construction_update_active_elements(); +void WindowRideConstructionUpdateActiveElements(); money32 RideEntranceExitPlaceGhost( const Ride& ride, const CoordsXY& entranceExitCoords, Direction direction, int32_t placeType, StationIndex stationNum); -ResultWithMessage ride_are_all_possible_entrances_and_exits_built(const Ride& ride); -void ride_fix_breakdown(Ride& ride, int32_t reliabilityIncreaseFactor); +ResultWithMessage RideAreAllPossibleEntrancesAndExitsBuilt(const Ride& ride); +void RideFixBreakdown(Ride& ride, int32_t reliabilityIncreaseFactor); -uint8_t ride_entry_get_vehicle_at_position(int32_t rideEntryIndex, int32_t numCarsPerTrain, int32_t position); -void ride_update_vehicle_colours(const Ride& ride); +uint8_t RideEntryGetVehicleAtPosition(int32_t rideEntryIndex, int32_t numCarsPerTrain, int32_t position); +void RideUpdateVehicleColours(const Ride& ride); -OpenRCT2::BitSet ride_entry_get_supported_track_pieces(const rct_ride_entry& rideEntry); +OpenRCT2::BitSet RideEntryGetSupportedTrackPieces(const rct_ride_entry& rideEntry); enum class RideSetSetting : uint8_t; -money32 set_operating_setting(RideId rideId, RideSetSetting setting, uint8_t value); -money32 set_operating_setting_nested(RideId rideId, RideSetSetting setting, uint8_t value, uint8_t flags); +money32 SetOperatingSetting(RideId rideId, RideSetSetting setting, uint8_t value); +money32 SetOperatingSettingNested(RideId rideId, RideSetSetting setting, uint8_t value, uint8_t flags); void UpdateGhostTrackAndArrow(); -uint32_t ride_customers_per_hour(const Ride& ride); -uint32_t ride_customers_in_last_5_minutes(const Ride& ride); +uint32_t RideCustomersPerHour(const Ride& ride); +uint32_t RideCustomersInLast5Minutes(const Ride& ride); -Vehicle* ride_get_broken_vehicle(const Ride& ride); +Vehicle* RideGetBrokenVehicle(const Ride& ride); -money16 ride_get_price(const Ride& ride); +money16 RideGetPrice(const Ride& ride); -TileElement* get_station_platform(const CoordsXYRangedZ& coords); -bool ride_has_adjacent_station(const Ride& ride); -bool ride_has_station_shelter(const Ride& ride); -bool ride_has_ratings(const Ride& ride); +TileElement* GetStationPlatform(const CoordsXYRangedZ& coords); +bool RideHasAdjacentStation(const Ride& ride); +bool RideHasStationShelter(const Ride& ride); +bool RideHasRatings(const Ride& ride); -int32_t get_booster_speed(ride_type_t rideType, int32_t rawSpeed); -void fix_invalid_vehicle_sprite_sizes(); -bool ride_entry_has_category(const rct_ride_entry& rideEntry, uint8_t category); +int32_t GetBoosterSpeed(ride_type_t rideType, int32_t rawSpeed); +void FixInvalidVehicleSpriteSizes(); +bool RideEntryHasCategory(const rct_ride_entry& rideEntry, uint8_t category); -int32_t ride_get_entry_index(int32_t rideType, int32_t rideSubType); +int32_t RideGetEntryIndex(int32_t rideType, int32_t rideSubType); -void determine_ride_entrance_and_exit_locations(); -void ride_clear_leftover_entrances(const Ride& ride); +void DetermineRideEntranceAndExitLocations(); +void RideClearLeftoverEntrances(const Ride& ride); std::vector GetTracklessRides(); diff --git a/src/openrct2/ride/RideAudio.cpp b/src/openrct2/ride/RideAudio.cpp index f8c5cd38a9..491446610c 100644 --- a/src/openrct2/ride/RideAudio.cpp +++ b/src/openrct2/ride/RideAudio.cpp @@ -168,7 +168,7 @@ namespace OpenRCT2::RideAudio void DefaultStartRideMusicChannel(const ViewportRideMusicInstance& instance) { auto& objManager = GetContext()->GetObjectManager(); - auto ride = get_ride(instance.RideId); + auto ride = GetRide(instance.RideId); auto musicObj = static_cast(objManager.GetLoadedObject(ObjectType::Music, ride->music)); if (musicObj != nullptr) { @@ -206,7 +206,7 @@ namespace OpenRCT2::RideAudio static void StartRideMusicChannel(const ViewportRideMusicInstance& instance) { // Create new music channel - auto ride = get_ride(instance.RideId); + auto ride = GetRide(instance.RideId); const auto& rtd = ride->GetRideTypeDescriptor(); rtd.StartRideMusic(instance); } diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 0360281833..7c117f190d 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -133,17 +133,17 @@ static rct_window* ride_create_or_find_construction_window(RideId rideIndex) void RideConstructionStart(Ride& ride) { CoordsXYE trackElement; - if (ride_try_get_origin_element(ride, &trackElement)) + if (RideTryGetOriginElement(ride, &trackElement)) { ride.FindTrackGap(trackElement, &trackElement); rct_window* w = WindowGetMain(); - if (w != nullptr && ride_modify(trackElement)) + if (w != nullptr && RideModify(trackElement)) WindowScrollToLocation(*w, { trackElement, trackElement.element->GetBaseZ() }); } else { - ride_initialise_construction_window(ride); + RideInitialiseConstructionWindow(ride); } } @@ -219,7 +219,7 @@ void Ride::RemoveVehicles() * * rct2: 0x006DD4AC */ -void ride_clear_for_construction(Ride& ride) +void RideClearForConstruction(Ride& ride) { ride.measurement = {}; @@ -231,12 +231,12 @@ void ride_clear_for_construction(Ride& ride) // To prevent these problems, unconditionally invalidate the test results on all clients in multiplayer games. if (network_get_mode() != NETWORK_MODE_NONE) { - invalidate_test_results(ride); + InvalidateTestResults(ride); } ride_remove_cable_lift(ride); ride.RemoveVehicles(); - ride_clear_blocked_tiles(ride); + RideClearBlockedTiles(ride); auto w = WindowFindByNumber(WindowClass::Ride, ride.id.ToUnderlying()); if (w != nullptr) @@ -250,7 +250,7 @@ void ride_clear_for_construction(Ride& ride) void Ride::RemovePeeps() { // Find first station - auto stationIndex = ride_get_first_valid_station_start(*this); + auto stationIndex = RideGetFirstValidStationStart(*this); // Get exit position and direction auto exitPosition = CoordsXYZD{ 0, 0, 0, INVALID_DIRECTION }; @@ -340,7 +340,7 @@ void Ride::RemovePeeps() window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN; } -void ride_clear_blocked_tiles(const Ride& ride) +void RideClearBlockedTiles(const Ride& ride) { for (TileCoordsXY tilePos = {}; tilePos.x < gMapSize.x; ++tilePos.x) { @@ -457,7 +457,7 @@ std::optional GetTrackElementOriginAndApplyChanges( return retCoordsXYZ; } -void ride_restore_provisional_track_piece() +void RideRestoreProvisionalTrackPiece() { if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_TRACK) { @@ -466,20 +466,20 @@ void ride_restore_provisional_track_piece() CoordsXYZ trackPos; if (WindowRideConstructionUpdateState(&type, &direction, &rideIndex, &liftHillAndAlternativeState, &trackPos, nullptr)) { - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); } else { _currentTrackPrice = PlaceProvisionalTrackPiece(rideIndex, type, direction, liftHillAndAlternativeState, trackPos); - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } } -void ride_remove_provisional_track_piece() +void RideRemoveProvisionalTrackPiece() { auto rideIndex = _currentRideIndex; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || !(_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_TRACK)) { return; @@ -515,7 +515,7 @@ void ride_remove_provisional_track_piece() y -= CoordsDirectionDelta[direction].y; } CoordsXYE next_track; - if (track_block_get_next_from_zero({ x, y, z }, *ride, direction, &next_track, &z, &direction, true)) + if (TrackBlockGetNextFromZero({ x, y, z }, *ride, direction, &next_track, &z, &direction, true)) { auto trackType = next_track.element->AsTrack()->GetTrackType(); int32_t trackSequence = next_track.element->AsTrack()->GetSequenceIndex(); @@ -533,7 +533,7 @@ void ride_remove_provisional_track_piece() * * rct2: 0x006C96C0 */ -void ride_construction_remove_ghosts() +void RideConstructionRemoveGhosts() { if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ENTRANCE_OR_EXIT) { @@ -542,7 +542,7 @@ void ride_construction_remove_ghosts() } if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_TRACK) { - ride_remove_provisional_track_piece(); + RideRemoveProvisionalTrackPiece(); _currentTrackSelectionFlags &= ~TRACK_SELECTION_FLAG_TRACK; } } @@ -550,7 +550,7 @@ void ride_construction_remove_ghosts() /* * rct2: 0x006C9627 */ -void ride_construction_invalidate_current_track() +void RideConstructionInvalidateCurrentTrack() { switch (_rideConstructionState) { @@ -568,7 +568,7 @@ void ride_construction_invalidate_current_track() { MapInvalidateTileFull(_currentTrackBegin.ToTileStart()); } - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); break; case RideConstructionState::Place: case RideConstructionState::EntranceExit: @@ -579,7 +579,7 @@ void ride_construction_invalidate_current_track() gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; MapInvalidateTileFull(_currentTrackBegin); } - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); break; } } @@ -590,7 +590,7 @@ void ride_construction_invalidate_current_track() */ static void ride_construction_reset_current_piece() { - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride == nullptr) return; @@ -621,10 +621,10 @@ static void ride_construction_reset_current_piece() * * rct2: 0x006C9800 */ -void ride_construction_set_default_next_piece() +void RideConstructionSetDefaultNextPiece() { auto rideIndex = _currentRideIndex; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return; @@ -641,7 +641,7 @@ void ride_construction_set_default_next_piece() { case RideConstructionState::Front: direction = _currentTrackPieceDirection; - if (!track_block_get_previous_from_zero(_currentTrackBegin, *ride, direction, &trackBeginEnd)) + if (!TrackBlockGetPreviousFromZero(_currentTrackBegin, *ride, direction, &trackBeginEnd)) { ride_construction_reset_current_piece(); return; @@ -693,7 +693,7 @@ void ride_construction_set_default_next_piece() break; case RideConstructionState::Back: direction = DirectionReverse(_currentTrackPieceDirection); - if (!track_block_get_next_from_zero(_currentTrackBegin, *ride, direction, &xyElement, &z, &direction, false)) + if (!TrackBlockGetNextFromZero(_currentTrackBegin, *ride, direction, &xyElement, &z, &direction, false)) { ride_construction_reset_current_piece(); return; @@ -748,11 +748,11 @@ void ride_construction_set_default_next_piece() * * rct2: 0x006C9296 */ -void ride_select_next_section() +void RideSelectNextSection() { if (_rideConstructionState == RideConstructionState::Selected) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); int32_t direction = _currentTrackPieceDirection; int32_t type = _currentTrackPieceType; TileElement* tileElement; @@ -761,7 +761,7 @@ void ride_select_next_section() if (!newCoords.has_value()) { _rideConstructionState = RideConstructionState::State0; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } @@ -772,7 +772,7 @@ void ride_select_next_section() inputElement.x = newCoords->x; inputElement.y = newCoords->y; inputElement.element = tileElement; - if (track_block_get_next(&inputElement, &outputElement, &newCoords->z, &direction)) + if (TrackBlockGetNext(&inputElement, &outputElement, &newCoords->z, &direction)) { newCoords->x = outputElement.x; newCoords->y = outputElement.y; @@ -787,7 +787,7 @@ void ride_select_next_section() _currentTrackPieceDirection = tileElement->GetDirection(); _currentTrackPieceType = tileElement->AsTrack()->GetTrackType(); _currentTrackSelectionFlags = 0; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } else { @@ -796,17 +796,17 @@ void ride_select_next_section() _currentTrackPieceDirection = direction; _currentTrackPieceType = tileElement->AsTrack()->GetTrackType(); _currentTrackSelectionFlags = 0; - ride_construction_set_default_next_piece(); - window_ride_construction_update_active_elements(); + RideConstructionSetDefaultNextPiece(); + WindowRideConstructionUpdateActiveElements(); } } else if (_rideConstructionState == RideConstructionState::Back) { gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - if (ride_select_forwards_from_back()) + if (RideSelectForwardsFromBack()) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } } @@ -815,11 +815,11 @@ void ride_select_next_section() * * rct2: 0x006C93B8 */ -void ride_select_previous_section() +void RideSelectPreviousSection() { if (_rideConstructionState == RideConstructionState::Selected) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); int32_t direction = _currentTrackPieceDirection; int32_t type = _currentTrackPieceType; TileElement* tileElement; @@ -828,7 +828,7 @@ void ride_select_previous_section() if (newCoords == std::nullopt) { _rideConstructionState = RideConstructionState::State0; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return; } @@ -836,7 +836,7 @@ void ride_select_previous_section() VirtualFloorInvalidate(); track_begin_end trackBeginEnd; - if (track_block_get_previous({ *newCoords, tileElement }, &trackBeginEnd)) + if (TrackBlockGetPrevious({ *newCoords, tileElement }, &trackBeginEnd)) { _currentTrackBegin.x = trackBeginEnd.begin_x; _currentTrackBegin.y = trackBeginEnd.begin_y; @@ -849,7 +849,7 @@ void ride_select_previous_section() // Set previous element's height. VirtualFloorSetHeight(trackBeginEnd.begin_element->GetBaseZ()); } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } else { @@ -860,17 +860,17 @@ void ride_select_previous_section() _currentTrackPieceDirection = trackBeginEnd.end_direction; _currentTrackPieceType = tileElement->AsTrack()->GetTrackType(); _currentTrackSelectionFlags = 0; - ride_construction_set_default_next_piece(); - window_ride_construction_update_active_elements(); + RideConstructionSetDefaultNextPiece(); + WindowRideConstructionUpdateActiveElements(); } } else if (_rideConstructionState == RideConstructionState::Front) { gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - if (ride_select_backwards_from_front()) + if (RideSelectBackwardsFromFront()) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); } } } @@ -889,7 +889,7 @@ static bool ride_modify_entrance_or_exit(const CoordsXYE& tileElement) return false; auto rideIndex = entranceElement->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -903,7 +903,7 @@ static bool ride_modify_entrance_or_exit(const CoordsXYE& tileElement) auto constructionWindow = WindowFindByClass(WindowClass::RideConstruction); if (constructionWindow == nullptr) { - if (!ride_initialise_construction_window(*ride)) + if (!RideInitialiseConstructionWindow(*ride)) return false; constructionWindow = WindowFindByClass(WindowClass::RideConstruction); @@ -911,7 +911,7 @@ static bool ride_modify_entrance_or_exit(const CoordsXYE& tileElement) return false; } - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); if (_rideConstructionState != RideConstructionState::EntranceExit || !(input_test_flag(INPUT_FLAG_TOOL_ACTIVE)) || gCurrentToolWidget.window_classification != WindowClass::RideConstruction) { @@ -930,7 +930,7 @@ static bool ride_modify_entrance_or_exit(const CoordsXYE& tileElement) _rideConstructionState = RideConstructionState::EntranceExit; } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_CONSTRUCT; } else @@ -985,14 +985,14 @@ static bool ride_modify_maze(const CoordsXYE& tileElement) * * rct2: 0x006CC056 */ -bool ride_modify(const CoordsXYE& input) +bool RideModify(const CoordsXYE& input) { auto tileElement = input; if (tileElement.element == nullptr) return false; auto rideIndex = tileElement.element->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { return false; @@ -1058,14 +1058,14 @@ bool ride_modify(const CoordsXYE& input) if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_NO_TRACK)) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return true; } - ride_select_next_section(); + RideSelectNextSection(); if (_rideConstructionState == RideConstructionState::Front) { - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return true; } @@ -1075,7 +1075,7 @@ bool ride_modify(const CoordsXYE& input) _currentTrackPieceType = type; _currentTrackSelectionFlags = 0; - ride_select_previous_section(); + RideSelectPreviousSection(); if (_rideConstructionState != RideConstructionState::Back) { @@ -1086,7 +1086,7 @@ bool ride_modify(const CoordsXYE& input) _currentTrackSelectionFlags = 0; } - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return true; } @@ -1094,7 +1094,7 @@ bool ride_modify(const CoordsXYE& input) * * rct2: 0x006CC3FB */ -int32_t ride_initialise_construction_window(Ride& ride) +int32_t RideInitialiseConstructionWindow(Ride& ride) { rct_window* w; @@ -1103,7 +1103,7 @@ int32_t ride_initialise_construction_window(Ride& ride) if (!ride_check_if_construction_allowed(ride)) return 0; - ride_clear_for_construction(ride); + RideClearForConstruction(ride); ride.RemovePeeps(); w = ride_create_or_find_construction_window(ride.id); @@ -1127,7 +1127,7 @@ int32_t ride_initialise_construction_window(Ride& ride) _rideConstructionState = RideConstructionState::Place; _currentTrackSelectionFlags = 0; - window_ride_construction_update_active_elements(); + WindowRideConstructionUpdateActiveElements(); return 1; } @@ -1135,18 +1135,18 @@ int32_t ride_initialise_construction_window(Ride& ride) * * rct2: 0x006CB7FB */ -int32_t ride_get_refund_price(const Ride& ride) +int32_t RideGetRefundPrice(const Ride& ride) { CoordsXYE trackElement; money32 cost = 0; - if (!ride_try_get_origin_element(ride, &trackElement)) + if (!RideTryGetOriginElement(ride, &trackElement)) { return 0; // Ride has no track to refund } // Find the start in case it is not a complete circuit - ride_get_start_of_track(&trackElement); + RideGetStartOfTrack(&trackElement); uint8_t direction = trackElement.element->GetDirection(); @@ -1168,7 +1168,7 @@ int32_t ride_get_refund_price(const Ride& ride) cost += res.Cost; - if (!track_block_get_next(&trackElement, &trackElement, nullptr, nullptr)) + if (!TrackBlockGetNext(&trackElement, &trackElement, nullptr, nullptr)) { break; } @@ -1176,7 +1176,7 @@ int32_t ride_get_refund_price(const Ride& ride) moveSlowIt = !moveSlowIt; if (moveSlowIt) { - if (!track_block_get_next(&slowIt, &slowIt, nullptr, nullptr) || slowIt.element == trackElement.element) + if (!TrackBlockGetNext(&slowIt, &slowIt, nullptr, nullptr) || slowIt.element == trackElement.element) { break; } @@ -1189,14 +1189,14 @@ int32_t ride_get_refund_price(const Ride& ride) return cost; } -money32 set_operating_setting(RideId rideId, RideSetSetting setting, uint8_t value) +money32 SetOperatingSetting(RideId rideId, RideSetSetting setting, uint8_t value) { auto rideSetSetting = RideSetSettingAction(rideId, setting, value); auto res = GameActions::Execute(&rideSetSetting); return res.Error == GameActions::Status::Ok ? 0 : MONEY32_UNDEFINED; } -money32 set_operating_setting_nested(RideId rideId, RideSetSetting setting, uint8_t value, uint8_t flags) +money32 SetOperatingSettingNested(RideId rideId, RideSetSetting setting, uint8_t value, uint8_t flags) { auto rideSetSetting = RideSetSettingAction(rideId, setting, value); rideSetSetting.SetFlags(flags); @@ -1209,7 +1209,7 @@ money32 set_operating_setting_nested(RideId rideId, RideSetSetting setting, uint * * rct2: 0x006CCF70 */ -CoordsXYZD ride_get_entrance_or_exit_position_from_screen_position(const ScreenCoordsXY& screenCoords) +CoordsXYZD RideGetEntranceOrExitPositionFromScreenPosition(const ScreenCoordsXY& screenCoords) { CoordsXYZD entranceExitCoords{}; gRideEntranceExitPlaceDirection = INVALID_DIRECTION; @@ -1238,7 +1238,7 @@ CoordsXYZD ride_get_entrance_or_exit_position_from_screen_position(const ScreenC } } - auto ride = get_ride(gRideEntranceExitPlaceRideIndex); + auto ride = GetRide(gRideEntranceExitPlaceRideIndex); if (ride == nullptr) { entranceExitCoords.SetNull(); @@ -1585,14 +1585,14 @@ void Ride::ValidateStations() } } -bool ride_select_backwards_from_front() +bool RideSelectBackwardsFromFront() { - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride != nullptr) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); track_begin_end trackBeginEnd; - if (track_block_get_previous_from_zero(_currentTrackBegin, *ride, _currentTrackPieceDirection, &trackBeginEnd)) + if (TrackBlockGetPreviousFromZero(_currentTrackBegin, *ride, _currentTrackPieceDirection, &trackBeginEnd)) { _rideConstructionState = RideConstructionState::Selected; _currentTrackBegin.x = trackBeginEnd.begin_x; @@ -1607,17 +1607,17 @@ bool ride_select_backwards_from_front() return false; } -bool ride_select_forwards_from_back() +bool RideSelectForwardsFromBack() { - auto ride = get_ride(_currentRideIndex); + auto ride = GetRide(_currentRideIndex); if (ride != nullptr) { - ride_construction_invalidate_current_track(); + RideConstructionInvalidateCurrentTrack(); int32_t z = _currentTrackBegin.z; int32_t direction = DirectionReverse(_currentTrackPieceDirection); CoordsXYE next_track; - if (track_block_get_next_from_zero(_currentTrackBegin, *ride, direction, &next_track, &z, &direction, false)) + if (TrackBlockGetNextFromZero(_currentTrackBegin, *ride, direction, &next_track, &z, &direction, false)) { _rideConstructionState = RideConstructionState::Selected; _currentTrackBegin.x = next_track.x; @@ -1636,7 +1636,7 @@ bool ride_select_forwards_from_back() * * rct2: 0x006B58EF */ -ResultWithMessage ride_are_all_possible_entrances_and_exits_built(const Ride& ride) +ResultWithMessage RideAreAllPossibleEntrancesAndExitsBuilt(const Ride& ride) { if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) return { true }; diff --git a/src/openrct2/ride/RideConstruction.h b/src/openrct2/ride/RideConstruction.h index 8ee723b881..e8a115a161 100644 --- a/src/openrct2/ride/RideConstruction.h +++ b/src/openrct2/ride/RideConstruction.h @@ -74,23 +74,23 @@ std::optional GetTrackElementOriginAndApplyChanges( void RideEntranceExitPlaceProvisionalGhost(); void RideEntranceExitRemoveGhost(); -void ride_restore_provisional_track_piece(); -void ride_remove_provisional_track_piece(); +void RideRestoreProvisionalTrackPiece(); +void RideRemoveProvisionalTrackPiece(); -void ride_construction_remove_ghosts(); +void RideConstructionRemoveGhosts(); -void ride_construction_invalidate_current_track(); +void RideConstructionInvalidateCurrentTrack(); -void ride_construction_set_default_next_piece(); +void RideConstructionSetDefaultNextPiece(); -void ride_select_next_section(); -void ride_select_previous_section(); +void RideSelectNextSection(); +void RideSelectPreviousSection(); -bool ride_modify(const CoordsXYE& input); +bool RideModify(const CoordsXYE& input); -CoordsXYZD ride_get_entrance_or_exit_position_from_screen_position(const ScreenCoordsXY& screenCoords); +CoordsXYZD RideGetEntranceOrExitPositionFromScreenPosition(const ScreenCoordsXY& screenCoords); -bool ride_select_backwards_from_front(); -bool ride_select_forwards_from_back(); +bool RideSelectBackwardsFromFront(); +bool RideSelectForwardsFromBack(); void RideConstructionStart(Ride& ride); diff --git a/src/openrct2/ride/RideEntry.h b/src/openrct2/ride/RideEntry.h index 584dbd82c3..93e547718d 100644 --- a/src/openrct2/ride/RideEntry.h +++ b/src/openrct2/ride/RideEntry.h @@ -100,4 +100,4 @@ struct rct_ride_entry } }; -RideNaming get_ride_naming(const ride_type_t rideType, const rct_ride_entry& rideEntry); +RideNaming GetRideNaming(const ride_type_t rideType, const rct_ride_entry& rideEntry); diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index e3a3f6717d..4258d07f95 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -99,7 +99,7 @@ static void ride_ratings_add(RatingTuple* rating, int32_t excitement, int32_t in * processed will be overwritten. * Only purpose of this function currently is for testing. */ -void ride_ratings_update_ride(const Ride& ride) +void RideRatingsUpdateRide(const Ride& ride) { RideRatingUpdateState state; if (ride.status != RideStatus::Closed) @@ -117,7 +117,7 @@ void ride_ratings_update_ride(const Ride& ride) * * rct2: 0x006B5A2A */ -void ride_ratings_update_all() +void RideRatingsUpdateAll() { PROFILED_FUNCTION(); @@ -180,13 +180,13 @@ static void ride_ratings_update_state_0(RideRatingUpdateState& state) // It is possible that the current ride being calculated has // been removed or due to import invalid. For both, reset // ratings and start check at the start - if (get_ride(state.CurrentRide) == nullptr) + if (GetRide(state.CurrentRide) == nullptr) { state.CurrentRide = {}; } auto nextRideId = GetNextRideToUpdate(state.CurrentRide); - auto nextRide = get_ride(nextRideId); + auto nextRide = GetRide(nextRideId); if (nextRide != nullptr && nextRide->status != RideStatus::Closed && !(nextRide->lifecycle_flags & RIDE_LIFECYCLE_FIXED_RATINGS)) { @@ -220,7 +220,7 @@ static void ride_ratings_update_state_1(RideRatingUpdateState& state) static void ride_ratings_update_state_2(RideRatingUpdateState& state) { const RideId rideIndex = state.CurrentRide; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || ride->status == RideStatus::Closed || ride->type >= RIDE_TYPE_COUNT) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; @@ -268,7 +268,7 @@ static void ride_ratings_update_state_2(RideRatingUpdateState& state) CoordsXYE trackElement = { state.Proximity, tileElement }; CoordsXYE nextTrackElement; - if (!track_block_get_next(&trackElement, &nextTrackElement, nullptr, nullptr)) + if (!TrackBlockGetNext(&trackElement, &nextTrackElement, nullptr, nullptr)) { state.State = RIDE_RATINGS_STATE_4; return; @@ -296,7 +296,7 @@ static void ride_ratings_update_state_2(RideRatingUpdateState& state) */ static void ride_ratings_update_state_3(RideRatingUpdateState& state) { - auto ride = get_ride(state.CurrentRide); + auto ride = GetRide(state.CurrentRide); if (ride == nullptr || ride->status == RideStatus::Closed) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; @@ -326,7 +326,7 @@ static void ride_ratings_update_state_4(RideRatingUpdateState& state) */ static void ride_ratings_update_state_5(RideRatingUpdateState& state) { - auto ride = get_ride(state.CurrentRide); + auto ride = GetRide(state.CurrentRide); if (ride == nullptr || ride->status == RideStatus::Closed) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; @@ -362,7 +362,7 @@ static void ride_ratings_update_state_5(RideRatingUpdateState& state) ride_ratings_score_close_proximity(state, tileElement); track_begin_end trackBeginEnd; - if (!track_block_get_previous({ state.Proximity, tileElement }, &trackBeginEnd)) + if (!TrackBlockGetPrevious({ state.Proximity, tileElement }, &trackBeginEnd)) { state.State = RIDE_RATINGS_STATE_CALCULATE; return; @@ -391,7 +391,7 @@ static void ride_ratings_update_state_5(RideRatingUpdateState& state) */ static void ride_ratings_begin_proximity_loop(RideRatingUpdateState& state) { - auto ride = get_ride(state.CurrentRide); + auto ride = GetRide(state.CurrentRide); if (ride == nullptr || ride->status == RideStatus::Closed) { state.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; @@ -744,7 +744,7 @@ static void ride_ratings_score_close_proximity(RideRatingUpdateState& state, Til static void ride_ratings_calculate(RideRatingUpdateState& state, Ride& ride) { - auto calcFunc = ride_ratings_get_calculate_func(ride.type); + auto calcFunc = RideRatingsGetCalculateFunc(ride.type); if (calcFunc != nullptr) { calcFunc(ride, state); @@ -829,7 +829,7 @@ static void ride_ratings_calculate_value(Ride& ride) }; #endif - if (!ride_has_ratings(ride)) + if (!RideHasRatings(ride)) { return; } @@ -1148,9 +1148,9 @@ static ShelteredEights get_num_of_sheltered_eighths(const Ride& ride) static RatingTuple get_flat_turns_rating(const Ride& ride) { - int32_t num3PlusTurns = get_turn_count_3_elements(ride, 0); - int32_t num2Turns = get_turn_count_2_elements(ride, 0); - int32_t num1Turns = get_turn_count_1_element(ride, 0); + int32_t num3PlusTurns = GetTurnCount3Elements(ride, 0); + int32_t num2Turns = GetTurnCount2Elements(ride, 0); + int32_t num1Turns = GetTurnCount1Element(ride, 0); RatingTuple rating; rating.Excitement = (num3PlusTurns * 0x28000) >> 16; @@ -1174,9 +1174,9 @@ static RatingTuple get_flat_turns_rating(const Ride& ride) */ static RatingTuple get_banked_turns_rating(const Ride& ride) { - int32_t num3PlusTurns = get_turn_count_3_elements(ride, 1); - int32_t num2Turns = get_turn_count_2_elements(ride, 1); - int32_t num1Turns = get_turn_count_1_element(ride, 1); + int32_t num3PlusTurns = GetTurnCount3Elements(ride, 1); + int32_t num2Turns = GetTurnCount2Elements(ride, 1); + int32_t num1Turns = GetTurnCount1Element(ride, 1); RatingTuple rating; rating.Excitement = (num3PlusTurns * 0x3C000) >> 16; @@ -1202,10 +1202,10 @@ static RatingTuple get_sloped_turns_rating(const Ride& ride) { RatingTuple rating; - int32_t num4PlusTurns = get_turn_count_4_plus_elements(ride, 2); - int32_t num3Turns = get_turn_count_3_elements(ride, 2); - int32_t num2Turns = get_turn_count_2_elements(ride, 2); - int32_t num1Turns = get_turn_count_1_element(ride, 2); + int32_t num4PlusTurns = GetTurnCount4PlusElements(ride, 2); + int32_t num3Turns = GetTurnCount3Elements(ride, 2); + int32_t num2Turns = GetTurnCount2Elements(ride, 2); + int32_t num1Turns = GetTurnCount1Element(ride, 2); rating.Excitement = (std::min(num4PlusTurns, 4) * 0x78000) >> 16; rating.Excitement += (std::min(num3Turns, 6) * 273066) >> 16; @@ -1279,7 +1279,7 @@ static RatingTuple GetSpecialTrackElementsRating(uint8_t type, const Ride& ride) const auto& rtd = ride.GetRideTypeDescriptor(); rtd.SpecialElementRatingAdjustment(ride, excitement, intensity, nausea); - uint8_t helixSections = ride_get_helix_sections(ride); + uint8_t helixSections = RideGetHelixSections(ride); int32_t helixesUpTo9 = std::min(helixSections, 9); excitement += (helixesUpTo9 * 254862) >> 16; @@ -1451,7 +1451,7 @@ static RatingTuple ride_ratings_get_drop_ratings(const Ride& ride) */ static int32_t ride_ratings_get_scenery_score(const Ride& ride) { - auto stationIndex = ride_get_first_valid_station_start(ride); + auto stationIndex = RideGetFirstValidStationStart(ride); CoordsXY location; if (stationIndex.IsNull()) @@ -1533,7 +1533,7 @@ static void ride_ratings_apply_length(RatingTuple* ratings, const Ride& ride, in static void ride_ratings_apply_synchronisation(RatingTuple* ratings, const Ride& ride, int32_t excitement, int32_t intensity) { - if ((ride.depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS) && ride_has_adjacent_station(ride)) + if ((ride.depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS) && RideHasAdjacentStation(ride)) { ride_ratings_add(ratings, excitement, intensity, 0); } @@ -4580,7 +4580,7 @@ void ride_ratings_calculate_classic_wooden_roller_coaster(Ride& ride, RideRating #pragma region Ride rating calculation function table -ride_ratings_calculation ride_ratings_get_calculate_func(ride_type_t rideType) +ride_ratings_calculation RideRatingsGetCalculateFunc(ride_type_t rideType) { return GetRideTypeDescriptor(rideType).RatingsCalculationFunction; } diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index d0c1132ee9..17a3a57a44 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -56,11 +56,11 @@ struct RideRatingUpdateState extern RideRatingUpdateState gRideRatingUpdateState; -void ride_ratings_update_ride(const Ride& ride); -void ride_ratings_update_all(); +void RideRatingsUpdateRide(const Ride& ride); +void RideRatingsUpdateAll(); using ride_ratings_calculation = void (*)(Ride& ride, RideRatingUpdateState& state); -ride_ratings_calculation ride_ratings_get_calculate_func(ride_type_t rideType); +ride_ratings_calculation RideRatingsGetCalculateFunc(ride_type_t rideType); void ride_ratings_calculate_spiral_roller_coaster(Ride& ride, RideRatingUpdateState& state); void ride_ratings_calculate_stand_up_roller_coaster(Ride& ride, RideRatingUpdateState& state); diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp index 436cce09ce..043a81ea70 100644 --- a/src/openrct2/ride/ShopItem.cpp +++ b/src/openrct2/ride/ShopItem.cpp @@ -115,7 +115,7 @@ uint64_t ShopItemsGetAllContainers() return AllContainerFlags; } -money32 shop_item_get_common_price(Ride* forRide, const ShopItem shopItem) +money32 ShopItemGetCommonPrice(Ride* forRide, const ShopItem shopItem) { for (const auto& ride : GetRideManager()) { @@ -144,7 +144,7 @@ money32 shop_item_get_common_price(Ride* forRide, const ShopItem shopItem) return MONEY32_UNDEFINED; } -bool shop_item_has_common_price(const ShopItem shopItem) +bool ShopItemHasCommonPrice(const ShopItem shopItem) { return (gSamePriceThroughoutPark & EnumToFlag(shopItem)) != 0; } diff --git a/src/openrct2/ride/ShopItem.h b/src/openrct2/ride/ShopItem.h index 1197d82435..e0a0b1e306 100644 --- a/src/openrct2/ride/ShopItem.h +++ b/src/openrct2/ride/ShopItem.h @@ -130,7 +130,7 @@ enum extern uint64_t gSamePriceThroughoutPark; -money32 shop_item_get_common_price(Ride* forRide, const ShopItem shopItem); -bool shop_item_has_common_price(const ShopItem shopItem); +money32 ShopItemGetCommonPrice(Ride* forRide, const ShopItem shopItem); +bool ShopItemHasCommonPrice(const ShopItem shopItem); const ShopItemDescriptor& GetShopItemDescriptor(ShopItem item); diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index a0ca23733f..057d17403e 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -28,7 +28,7 @@ static void ride_invalidate_station_start(Ride& ride, StationIndex stationIndex, * * rct2: 0x006ABFFB */ -void ride_update_station(Ride& ride, StationIndex stationIndex) +void RideUpdateStation(Ride& ride, StationIndex stationIndex) { if (ride.GetStation(stationIndex).Start.IsNull()) return; @@ -57,7 +57,7 @@ void ride_update_station(Ride& ride, StationIndex stationIndex) */ static void ride_update_station_blocksection(Ride& ride, StationIndex stationIndex) { - TileElement* tileElement = ride_get_station_start_track_element(ride, stationIndex); + TileElement* tileElement = RideGetStationStartTrackElement(ride, stationIndex); auto& station = ride.GetStation(stationIndex); if ((ride.status == RideStatus::Closed && ride.num_riders == 0) @@ -321,7 +321,7 @@ static void ride_race_init_vehicle_speeds(const Ride& ride) static void ride_invalidate_station_start(Ride& ride, StationIndex stationIndex, bool greenLight) { auto startPos = ride.GetStation(stationIndex).Start; - TileElement* tileElement = ride_get_station_start_track_element(ride, stationIndex); + TileElement* tileElement = RideGetStationStartTrackElement(ride, stationIndex); // If no station track found return if (tileElement == nullptr) @@ -333,7 +333,7 @@ static void ride_invalidate_station_start(Ride& ride, StationIndex stationIndex, MapInvalidateTileZoom1({ startPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); } -TileElement* ride_get_station_start_track_element(const Ride& ride, StationIndex stationIndex) +TileElement* RideGetStationStartTrackElement(const Ride& ride, StationIndex stationIndex) { auto stationStart = ride.GetStation(stationIndex).GetStart(); @@ -351,7 +351,7 @@ TileElement* ride_get_station_start_track_element(const Ride& ride, StationIndex return nullptr; } -TileElement* ride_get_station_exit_element(const CoordsXYZ& elementPos) +TileElement* RideGetStationExitElement(const CoordsXYZ& elementPos) { // Find the station track element TileElement* tileElement = MapGetFirstElementAt(elementPos); @@ -368,7 +368,7 @@ TileElement* ride_get_station_exit_element(const CoordsXYZ& elementPos) return nullptr; } -StationIndex ride_get_first_valid_station_exit(const Ride& ride) +StationIndex RideGetFirstValidStationExit(const Ride& ride) { for (const auto& station : ride.GetStations()) { @@ -380,7 +380,7 @@ StationIndex ride_get_first_valid_station_exit(const Ride& ride) return StationIndex::GetNull(); } -StationIndex ride_get_first_valid_station_start(const Ride& ride) +StationIndex RideGetFirstValidStationStart(const Ride& ride) { for (const auto& station : ride.GetStations()) { @@ -392,7 +392,7 @@ StationIndex ride_get_first_valid_station_start(const Ride& ride) return StationIndex::GetNull(); } -StationIndex ride_get_first_empty_station_start(const Ride& ride) +StationIndex RideGetFirstEmptyStationStart(const Ride& ride) { for (const auto& station : ride.GetStations()) { diff --git a/src/openrct2/ride/Station.h b/src/openrct2/ride/Station.h index 9edfb48b83..f412af76b2 100644 --- a/src/openrct2/ride/Station.h +++ b/src/openrct2/ride/Station.h @@ -15,7 +15,7 @@ struct Ride; struct TileCoordsXYZD; -void ride_update_station(Ride& ride, StationIndex stationIndex); -StationIndex ride_get_first_valid_station_exit(const Ride& ride); -StationIndex ride_get_first_valid_station_start(const Ride& ride); -StationIndex ride_get_first_empty_station_start(const Ride& ride); +void RideUpdateStation(Ride& ride, StationIndex stationIndex); +StationIndex RideGetFirstValidStationExit(const Ride& ride); +StationIndex RideGetFirstValidStationStart(const Ride& ride); +StationIndex RideGetFirstEmptyStationStart(const Ride& ride); diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 093f4f31c8..7f78ec9167 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -51,7 +51,7 @@ PitchAndRoll TrackPitchAndRollEnd(track_type_t trackType) /** * Helper method to determine if a connects to b by its bank and angle, not location. */ -int32_t track_is_connected_by_shape(TileElement* a, TileElement* b) +int32_t TrackIsConnectedByShape(TileElement* a, TileElement* b) { int32_t trackType, aBank, aAngle, bBank, bAngle; @@ -59,13 +59,13 @@ int32_t track_is_connected_by_shape(TileElement* a, TileElement* b) const auto* ted = &GetTrackElementDescriptor(trackType); aBank = ted->Definition.bank_end; aAngle = ted->Definition.vangle_end; - aBank = track_get_actual_bank(a, aBank); + aBank = TrackGetActualBank(a, aBank); trackType = b->AsTrack()->GetTrackType(); ted = &GetTrackElementDescriptor(trackType); bBank = ted->Definition.bank_start; bAngle = ted->Definition.vangle_start; - bBank = track_get_actual_bank(b, bBank); + bBank = TrackGetActualBank(b, bBank); return aBank == bBank && aAngle == bAngle; } @@ -111,9 +111,9 @@ static void ride_remove_station(Ride& ride, const CoordsXYZ& location) * * rct2: 0x006C4D89 */ -ResultWithMessage track_add_station_element(CoordsXYZD loc, RideId rideIndex, int32_t flags, bool fromTrackDesign) +ResultWithMessage TrackAddStationElement(CoordsXYZD loc, RideId rideIndex, int32_t flags, bool fromTrackDesign) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return { false }; @@ -129,7 +129,7 @@ ResultWithMessage track_add_station_element(CoordsXYZD loc, RideId rideIndex, in } if (flags & GAME_COMMAND_FLAG_APPLY) { - auto stationIndex = ride_get_first_empty_station_start(*ride); + auto stationIndex = RideGetFirstEmptyStationStart(*ride); assert(!stationIndex.IsNull()); auto& station = ride->GetStation(stationIndex); @@ -217,7 +217,7 @@ ResultWithMessage track_add_station_element(CoordsXYZD loc, RideId rideIndex, in track_type_t targetTrackType; if (stationFrontLoc == loc) { - auto stationIndex = ride_get_first_empty_station_start(*ride); + auto stationIndex = RideGetFirstEmptyStationStart(*ride); if (stationIndex.IsNull()) { log_verbose("No empty station starts, not updating metadata! This can happen with hacked rides."); @@ -261,9 +261,9 @@ ResultWithMessage track_add_station_element(CoordsXYZD loc, RideId rideIndex, in * * rct2: 0x006C494B */ -ResultWithMessage track_remove_station_element(const CoordsXYZD& loc, RideId rideIndex, int32_t flags) +ResultWithMessage TrackRemoveStationElement(const CoordsXYZD& loc, RideId rideIndex, int32_t flags) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return { false }; @@ -352,7 +352,7 @@ ResultWithMessage track_remove_station_element(const CoordsXYZD& loc, RideId rid track_type_t targetTrackType; if ((currentLoc == stationFrontLoc) || (currentLoc + CoordsDirectionDelta[currentLoc.direction] == removeLoc)) { - auto stationIndex = ride_get_first_empty_station_start(*ride); + auto stationIndex = RideGetFirstEmptyStationStart(*ride); if (stationIndex.IsNull()) { log_verbose("No empty station starts, not updating metadata! This can happen with hacked rides."); @@ -404,7 +404,7 @@ ResultWithMessage track_remove_station_element(const CoordsXYZD& loc, RideId rid return { true }; } -void track_circuit_iterator_begin(track_circuit_iterator* it, CoordsXYE first) +void TrackCircuitIteratorBegin(track_circuit_iterator* it, CoordsXYE first) { it->last = first; it->first = nullptr; @@ -412,13 +412,13 @@ void track_circuit_iterator_begin(track_circuit_iterator* it, CoordsXYE first) it->looped = false; } -bool track_circuit_iterator_previous(track_circuit_iterator* it) +bool TrackCircuitIteratorPrevious(track_circuit_iterator* it) { track_begin_end trackBeginEnd; if (it->first == nullptr) { - if (!track_block_get_previous({ it->last.x, it->last.y, it->last.element }, &trackBeginEnd)) + if (!TrackBlockGetPrevious({ it->last.x, it->last.y, it->last.element }, &trackBeginEnd)) return false; it->current.x = trackBeginEnd.begin_x; @@ -440,7 +440,7 @@ bool track_circuit_iterator_previous(track_circuit_iterator* it) it->firstIteration = false; it->last = it->current; - if (track_block_get_previous({ it->last.x, it->last.y, it->last.element }, &trackBeginEnd)) + if (TrackBlockGetPrevious({ it->last.x, it->last.y, it->last.element }, &trackBeginEnd)) { it->current.x = trackBeginEnd.end_x; it->current.y = trackBeginEnd.end_y; @@ -453,11 +453,11 @@ bool track_circuit_iterator_previous(track_circuit_iterator* it) return false; } -bool track_circuit_iterator_next(track_circuit_iterator* it) +bool TrackCircuitIteratorNext(track_circuit_iterator* it) { if (it->first == nullptr) { - if (!track_block_get_next(&it->last, &it->current, &it->currentZ, &it->currentDirection)) + if (!TrackBlockGetNext(&it->last, &it->current, &it->currentZ, &it->currentDirection)) return false; it->first = it->current.element; @@ -472,17 +472,17 @@ bool track_circuit_iterator_next(track_circuit_iterator* it) it->firstIteration = false; it->last = it->current; - return track_block_get_next(&it->last, &it->current, &it->currentZ, &it->currentDirection); + return TrackBlockGetNext(&it->last, &it->current, &it->currentZ, &it->currentDirection); } -bool track_circuit_iterators_match(const track_circuit_iterator* firstIt, const track_circuit_iterator* secondIt) +bool TrackCircuitIteratorsMatch(const track_circuit_iterator* firstIt, const track_circuit_iterator* secondIt) { return ( firstIt->currentZ == secondIt->currentZ && firstIt->currentDirection == secondIt->currentDirection && firstIt->current.x == secondIt->current.x && firstIt->current.y == secondIt->current.y); } -void track_get_back(const CoordsXYE& input, CoordsXYE* output) +void TrackGetBack(const CoordsXYE& input, CoordsXYE* output) { CoordsXYE lastTrack; track_begin_end currentTrack; @@ -491,7 +491,7 @@ void track_get_back(const CoordsXYE& input, CoordsXYE* output) lastTrack = input; do { - result = track_block_get_previous(lastTrack, ¤tTrack); + result = TrackBlockGetPrevious(lastTrack, ¤tTrack); if (result) { lastTrack.x = currentTrack.begin_x; @@ -502,7 +502,7 @@ void track_get_back(const CoordsXYE& input, CoordsXYE* output) *output = lastTrack; } -void track_get_front(const CoordsXYE& input, CoordsXYE* output) +void TrackGetFront(const CoordsXYE& input, CoordsXYE* output) { CoordsXYE lastTrack, currentTrack; int32_t z, direction; @@ -511,7 +511,7 @@ void track_get_front(const CoordsXYE& input, CoordsXYE* output) lastTrack = input; do { - result = track_block_get_next(&lastTrack, ¤tTrack, &z, &direction); + result = TrackBlockGetNext(&lastTrack, ¤tTrack, &z, &direction); if (result) { lastTrack = currentTrack; @@ -563,18 +563,18 @@ bool TrackElement::IsBlockStart() const return false; } -roll_type_t track_get_actual_bank(TileElement* tileElement, roll_type_t bank) +roll_type_t TrackGetActualBank(TileElement* tileElement, roll_type_t bank) { - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride != nullptr) { bool isInverted = tileElement->AsTrack()->IsInverted(); - return track_get_actual_bank_2(ride->type, isInverted, bank); + return TrackGetActualBank2(ride->type, isInverted, bank); } return bank; } -roll_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, roll_type_t bank) +roll_type_t TrackGetActualBank2(int32_t rideType, bool isInverted, roll_type_t bank) { if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE)) { @@ -593,25 +593,25 @@ roll_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, roll_type return bank; } -roll_type_t track_get_actual_bank_3(bool useInvertedSprites, TileElement* tileElement) +roll_type_t TrackGetActualBank3(bool useInvertedSprites, TileElement* tileElement) { auto trackType = tileElement->AsTrack()->GetTrackType(); const auto& ted = GetTrackElementDescriptor(trackType); auto bankStart = ted.Definition.bank_start; - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr) return bankStart; bool isInverted = useInvertedSprites ^ tileElement->AsTrack()->IsInverted(); - return track_get_actual_bank_2(ride->type, isInverted, bankStart); + return TrackGetActualBank2(ride->type, isInverted, bankStart); } bool TrackElement::IsStation() const { - return track_type_is_station(GetTrackType()); + return TrackTypeIsStation(GetTrackType()); } -bool track_type_is_station(track_type_t trackType) +bool TrackTypeIsStation(track_type_t trackType) { switch (trackType) { @@ -624,7 +624,7 @@ bool track_type_is_station(track_type_t trackType) } } -bool track_element_is_covered(track_type_t trackElementType) +bool TrackElementIsCovered(track_type_t trackElementType) { switch (trackElementType) { @@ -693,7 +693,7 @@ std::optional GetTrackSegmentOrigin(const CoordsXYE& posEl) uint8_t TrackElement::GetSeatRotation() const { - const auto* ride = get_ride(GetRideIndex()); + const auto* ride = GetRide(GetRideIndex()); if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_LANDSCAPE_DOORS)) return DEFAULT_SEAT_ROTATION; diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 5edad31b1f..60e8106492 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -612,25 +612,25 @@ struct track_circuit_iterator PitchAndRoll TrackPitchAndRollStart(track_type_t trackType); PitchAndRoll TrackPitchAndRollEnd(track_type_t trackType); -int32_t track_is_connected_by_shape(TileElement* a, TileElement* b); +int32_t TrackIsConnectedByShape(TileElement* a, TileElement* b); -void track_circuit_iterator_begin(track_circuit_iterator* it, CoordsXYE first); -bool track_circuit_iterator_previous(track_circuit_iterator* it); -bool track_circuit_iterator_next(track_circuit_iterator* it); -bool track_circuit_iterators_match(const track_circuit_iterator* firstIt, const track_circuit_iterator* secondIt); +void TrackCircuitIteratorBegin(track_circuit_iterator* it, CoordsXYE first); +bool TrackCircuitIteratorPrevious(track_circuit_iterator* it); +bool TrackCircuitIteratorNext(track_circuit_iterator* it); +bool TrackCircuitIteratorsMatch(const track_circuit_iterator* firstIt, const track_circuit_iterator* secondIt); -void track_get_back(const CoordsXYE& input, CoordsXYE* output); -void track_get_front(const CoordsXYE& input, CoordsXYE* output); +void TrackGetBack(const CoordsXYE& input, CoordsXYE* output); +void TrackGetFront(const CoordsXYE& input, CoordsXYE* output); -bool track_element_is_covered(track_type_t trackElementType); -bool track_type_is_station(track_type_t trackType); +bool TrackElementIsCovered(track_type_t trackElementType); +bool TrackTypeIsStation(track_type_t trackType); -roll_type_t track_get_actual_bank(TileElement* tileElement, roll_type_t bank); -roll_type_t track_get_actual_bank_2(int32_t rideType, bool isInverted, roll_type_t bank); -roll_type_t track_get_actual_bank_3(bool useInvertedSprites, TileElement* tileElement); +roll_type_t TrackGetActualBank(TileElement* tileElement, roll_type_t bank); +roll_type_t TrackGetActualBank2(int32_t rideType, bool isInverted, roll_type_t bank); +roll_type_t TrackGetActualBank3(bool useInvertedSprites, TileElement* tileElement); -ResultWithMessage track_add_station_element(CoordsXYZD loc, RideId rideIndex, int32_t flags, bool fromTrackDesign); -ResultWithMessage track_remove_station_element(const CoordsXYZD& loc, RideId rideIndex, int32_t flags); +ResultWithMessage TrackAddStationElement(CoordsXYZD loc, RideId rideIndex, int32_t flags, bool fromTrackDesign); +ResultWithMessage TrackRemoveStationElement(const CoordsXYZD& loc, RideId rideIndex, int32_t flags); bool TrackTypeHasSpeedSetting(track_type_t trackType); bool TrackTypeIsHelix(track_type_t trackType); diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 64beaad44e..616c46ab83 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -175,12 +175,12 @@ ResultWithMessage TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ri ResultWithMessage TrackDesign::CreateTrackDesignTrack(TrackDesignState& tds, const Ride& ride) { CoordsXYE trackElement; - if (!ride_try_get_origin_element(ride, &trackElement)) + if (!RideTryGetOriginElement(ride, &trackElement)) { return { false, STR_TRACK_TOO_LARGE_OR_TOO_MUCH_SCENERY }; } - ride_get_start_of_track(&trackElement); + RideGetStartOfTrack(&trackElement); int32_t z = trackElement.element->GetBaseZ(); auto trackType = trackElement.element->AsTrack()->GetTrackType(); @@ -241,7 +241,7 @@ ResultWithMessage TrackDesign::CreateTrackDesignTrack(TrackDesignState& tds, con track.flags = trackFlags; track_elements.push_back(track); - if (!track_block_get_next(&trackElement, &trackElement, nullptr, nullptr)) + if (!TrackBlockGetNext(&trackElement, &trackElement, nullptr, nullptr)) { break; } @@ -1998,7 +1998,7 @@ static bool TrackDesignPlacePreview(TrackDesignState& tds, TrackDesign* td6, mon return false; } - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return false; @@ -2211,7 +2211,7 @@ static void TrackDesignPreviewClearMap() SetTileElements(std::move(tileElements)); } -bool track_design_are_entrance_and_exit_placed() +bool TrackDesignAreEntranceAndExitPlaced() { return _trackDesignPlaceStateEntranceExitPlaced; } diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index 185c08cfa2..49e6b082fb 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -238,14 +238,14 @@ void TrackDesignDrawPreview(TrackDesign* td6, uint8_t* pixels); /////////////////////////////////////////////////////////////////////////////// // Track design saving /////////////////////////////////////////////////////////////////////////////// -void track_design_save_init(); -void track_design_save_reset_scenery(); -bool track_design_save_contains_tile_element(const TileElement* tileElement); -void track_design_save_select_nearby_scenery(RideId rideIndex); -void track_design_save_select_tile_element( +void TrackDesignSaveInit(); +void TrackDesignSaveResetScenery(); +bool TrackDesignSaveContainsTileElement(const TileElement* tileElement); +void TrackDesignSaveSelectNearbyScenery(RideId rideIndex); +void TrackDesignSaveSelectTileElement( ViewportInteractionItem interactionType, const CoordsXY& loc, TileElement* tileElement, bool collect); -bool track_design_are_entrance_and_exit_placed(); +bool TrackDesignAreEntranceAndExitPlaced(); extern std::vector _trackSavedTileElementsDesc; extern std::vector _trackSavedTileElements; diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 17820e9194..3be8ace9a6 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -317,26 +317,26 @@ std::unique_ptr CreateTrackDesignRepository(const std::s return std::make_unique(env); } -void track_repository_scan() +void TrackRepositoryScan() { ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository(); repo->Scan(LocalisationService_GetCurrentLanguage()); } -bool track_repository_delete(const u8string& path) +bool TrackRepositoryDelete(const u8string& path) { ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository(); return repo->Delete(path); } -bool track_repository_rename(const u8string& path, const u8string& newName) +bool TrackRepositoryRename(const u8string& path, const u8string& newName) { ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository(); std::string newPath = repo->Rename(path, newName); return !newPath.empty(); } -bool track_repository_install(const u8string& srcPath, const u8string& name) +bool TrackRepositoryInstall(const u8string& srcPath, const u8string& name) { ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository(); std::string newPath = repo->Install(srcPath, name); diff --git a/src/openrct2/ride/TrackDesignRepository.h b/src/openrct2/ride/TrackDesignRepository.h index db22d93359..cdfceb2f0b 100644 --- a/src/openrct2/ride/TrackDesignRepository.h +++ b/src/openrct2/ride/TrackDesignRepository.h @@ -47,7 +47,7 @@ struct ITrackDesignRepository const std::shared_ptr& env); [[nodiscard]] std::string GetNameFromTrackPath(const std::string& path); -void track_repository_scan(); -bool track_repository_delete(const u8string& path); -bool track_repository_rename(const u8string& path, const u8string& newName); -bool track_repository_install(const u8string& srcPath, const u8string& name); +void TrackRepositoryScan(); +bool TrackRepositoryDelete(const u8string& path); +bool TrackRepositoryRename(const u8string& path, const u8string& newName); +bool TrackRepositoryInstall(const u8string& srcPath, const u8string& name); diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 4f7459763d..3580a392b4 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -69,7 +69,7 @@ static TrackDesignAddStatus track_design_save_add_tile_element( static void track_design_save_remove_tile_element( ViewportInteractionItem interactionType, const CoordsXY& loc, TileElement* tileElement); -void track_design_save_init() +void TrackDesignSaveInit() { _trackSavedTileElements.clear(); _trackSavedTileElementsDesc.clear(); @@ -79,10 +79,10 @@ void track_design_save_init() * * rct2: 0x006D2B07 */ -void track_design_save_select_tile_element( +void TrackDesignSaveSelectTileElement( ViewportInteractionItem interactionType, const CoordsXY& loc, TileElement* tileElement, bool collect) { - if (track_design_save_contains_tile_element(tileElement)) + if (TrackDesignSaveContainsTileElement(tileElement)) { if (!collect) { @@ -106,7 +106,7 @@ void track_design_save_select_tile_element( * * rct2: 0x006D303D */ -void track_design_save_select_nearby_scenery(RideId rideIndex) +void TrackDesignSaveSelectNearbyScenery(RideId rideIndex) { tile_element_iterator it; TileElementIteratorBegin(&it); @@ -125,13 +125,13 @@ void track_design_save_select_nearby_scenery(RideId rideIndex) * * rct2: 0x006D3026 */ -void track_design_save_reset_scenery() +void TrackDesignSaveResetScenery() { - track_design_save_init(); + TrackDesignSaveInit(); GfxInvalidateScreen(); } -bool track_design_save_contains_tile_element(const TileElement* tileElement) +bool TrackDesignSaveContainsTileElement(const TileElement* tileElement) { for (auto& tile : _trackSavedTileElements) { @@ -647,7 +647,7 @@ static void track_design_save_select_nearby_scenery_for_tile(RideId rideIndex, i if (interactionType != ViewportInteractionItem::None) { - if (!track_design_save_contains_tile_element(tileElement)) + if (!TrackDesignSaveContainsTileElement(tileElement)) { track_design_save_add_tile_element(interactionType, TileCoordsXY(x, y).ToCoordsXY(), tileElement); } diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 9eee144f90..abb4e1e6a2 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -2174,7 +2174,7 @@ void track_paint_util_left_corkscrew_up_supports(PaintSession& session, Directio void PaintTrack(PaintSession& session, Direction direction, int32_t height, const TrackElement& trackElement) { RideId rideIndex = trackElement.GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) { log_error("Attempted to paint invalid ride: %d", rideIndex); diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 92443c4022..23168acce1 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -598,7 +598,7 @@ const rct_vehicle_info* Vehicle::GetMoveInfo() const return vehicle_get_move_info(TrackSubposition, GetTrackType(), GetTrackDirection(), track_progress); } -uint16_t vehicle_get_move_info_size(VehicleTrackSubposition trackSubposition, track_type_t type, uint8_t direction) +uint16_t VehicleGetMoveInfoSize(VehicleTrackSubposition trackSubposition, track_type_t type, uint8_t direction) { uint16_t typeAndDirection = (type << 2) | (direction & 3); @@ -611,7 +611,7 @@ uint16_t vehicle_get_move_info_size(VehicleTrackSubposition trackSubposition, tr uint16_t Vehicle::GetTrackProgress() const { - return vehicle_get_move_info_size(TrackSubposition, GetTrackType(), GetTrackDirection()); + return VehicleGetMoveInfoSize(TrackSubposition, GetTrackType(), GetTrackDirection()); } void Vehicle::ApplyMass(int16_t appliedMass) @@ -628,7 +628,7 @@ void Vehicle::MoveRelativeDistance(int32_t distance) ClearUpdateFlag(VEHICLE_UPDATE_FLAG_SINGLE_CAR_POSITION | VEHICLE_UPDATE_FLAG_COLLISION_DISABLED); } -Vehicle* try_get_vehicle(EntityId spriteIndex) +Vehicle* TryGetVehicle(EntityId spriteIndex) { return TryGetEntity(spriteIndex); } @@ -1140,7 +1140,7 @@ static void UpdateSound( * * rct2: 0x006BBC6B */ -void vehicle_sounds_update() +void VehicleSoundsUpdate() { PROFILED_FUNCTION(); @@ -1227,7 +1227,7 @@ void vehicle_sounds_update() * * rct2: 0x006D4204 */ -void vehicle_update_all() +void VehicleUpdateAll() { PROFILED_FUNCTION(); @@ -1266,7 +1266,7 @@ bool Vehicle::CloseRestraints() { curRide->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN; - ride_breakdown_add_news_item(*curRide); + RideBreakdownAddNewsItem(*curRide); curRide->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST | RIDE_INVALIDATE_RIDE_MAINTENANCE; @@ -1382,7 +1382,7 @@ bool Vehicle::OpenRestraints() { curRide->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN; - ride_breakdown_add_news_item(*curRide); + RideBreakdownAddNewsItem(*curRide); curRide->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST | RIDE_INVALIDATE_RIDE_MAINTENANCE; @@ -1600,16 +1600,16 @@ void Vehicle::UpdateMeasurements() switch (curRide->turn_count_default >> 11) { case 0: - increment_turn_count_1_element(*curRide, turnType); + IncrementTurnCount1Element(*curRide, turnType); break; case 1: - increment_turn_count_2_elements(*curRide, turnType); + IncrementTurnCount2Elements(*curRide, turnType); break; case 2: - increment_turn_count_3_elements(*curRide, turnType); + IncrementTurnCount3Elements(*curRide, turnType); break; default: - increment_turn_count_4_plus_elements(*curRide, turnType); + IncrementTurnCount4PlusElements(*curRide, turnType); break; } } @@ -1711,7 +1711,7 @@ void Vehicle::UpdateMeasurements() if (trackFlags & TRACK_ELEM_FLAG_HELIX) { - uint8_t helixes = ride_get_helix_sections(*curRide); + uint8_t helixes = RideGetHelixSections(*curRide); if (helixes != OpenRCT2::Limits::MaxHelices) helixes++; @@ -2460,7 +2460,7 @@ void Vehicle::UpdateWaitingToDepart() int32_t direction; uint8_t trackDirection = GetTrackDirection(); - if (track_block_get_next_from_zero(TrackLocation, *curRide, trackDirection, &track, &zUnused, &direction, false)) + if (TrackBlockGetNextFromZero(TrackLocation, *curRide, trackDirection, &track, &zUnused, &direction, false)) { if (track.element->AsTrack()->HasCableLift()) { @@ -2615,7 +2615,7 @@ static bool try_add_synchronised_station(const CoordsXYZ& coords) return false; } - TileElement* tileElement = get_station_platform({ coords, coords.z + 2 * COORDS_Z_STEP }); + TileElement* tileElement = GetStationPlatform({ coords, coords.z + 2 * COORDS_Z_STEP }); if (tileElement == nullptr) { /* No station platform element found, @@ -2624,7 +2624,7 @@ static bool try_add_synchronised_station(const CoordsXYZ& coords) } auto rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || !(ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS)) { /* Ride is not set to synchronise with adjacent stations. */ @@ -2768,7 +2768,7 @@ static bool ride_station_can_depart_synchronised(const Ride& ride, StationIndex for (rct_synchronised_vehicle* sv = _synchronisedVehicles; sv < _lastSynchronisedVehicle; sv++) { - Ride* sv_ride = get_ride(sv->ride_id); + Ride* sv_ride = GetRide(sv->ride_id); if (!(sv_ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { @@ -2794,7 +2794,7 @@ static bool ride_station_can_depart_synchronised(const Ride& ride, StationIndex } /* Here all the of sync-ed stations are from the same ride */ - auto curRide = get_ride(rideId); + auto curRide = GetRide(rideId); if (curRide != nullptr) { for (int32_t i = 0; i < curRide->NumTrains; i++) @@ -3111,7 +3111,7 @@ void Vehicle::UpdateDeparting() return; curRide->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN; - ride_breakdown_add_news_item(*curRide); + RideBreakdownAddNewsItem(*curRide); curRide->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST | RIDE_INVALIDATE_RIDE_MAINTENANCE; @@ -4141,7 +4141,7 @@ void Vehicle::UpdateTravellingCableLift() return; curRide->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN; - ride_breakdown_add_news_item(*curRide); + RideBreakdownAddNewsItem(*curRide); curRide->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST | RIDE_INVALIDATE_RIDE_MAINTENANCE; @@ -5993,7 +5993,7 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const if (carEntry->flags & CAR_ENTRY_FLAG_NO_UPSTOP_WHEELS) { auto trackType = GetTrackType(); - if (!track_element_is_covered(trackType)) + if (!TrackElementIsCovered(trackType)) { auto gForces = GetGForces(); gForces.LateralG = std::abs(gForces.LateralG); @@ -6022,7 +6022,7 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const { // No up stops bobsleigh type auto trackType = GetTrackType(); - if (!track_element_is_covered(trackType)) + if (!TrackElementIsCovered(trackType)) { auto gForces = GetGForces(); @@ -6199,7 +6199,7 @@ static void block_brakes_open_previous_section( CoordsXY slowLocation = location; do { - if (!track_block_get_previous({ location, tileElement }, &trackBeginEnd)) + if (!TrackBlockGetPrevious({ location, tileElement }, &trackBeginEnd)) { return; } @@ -6218,7 +6218,7 @@ static void block_brakes_open_previous_section( counter = !counter; if (counter) { - track_block_get_previous({ slowLocation, &slowTileElement }, &slowTrackBeginEnd); + TrackBlockGetPrevious({ slowLocation, &slowTileElement }, &slowTrackBeginEnd); slowLocation.x = slowTrackBeginEnd.end_x; slowLocation.y = slowTrackBeginEnd.end_y; slowTileElement = *(slowTrackBeginEnd.begin_element); @@ -6456,7 +6456,7 @@ void Vehicle::UpdateSwingingCar() break; } - if (track_type_is_station(trackType) || trackType == TrackElemType::Brakes || trackType == TrackElemType::BlockBrakes) + if (TrackTypeIsStation(trackType) || trackType == TrackElemType::Brakes || trackType == TrackElemType::BlockBrakes) { dx = 0; cx = 0; @@ -6669,7 +6669,7 @@ void Vehicle::UpdateAdditionalAnimation() auto curRide = GetRide(); if (curRide != nullptr) { - if (!ride_has_station_shelter(*curRide) + if (!RideHasStationShelter(*curRide) || (status != Vehicle::Status::MovingToEndOfStation && status != Vehicle::Status::Arriving)) { int32_t typeIndex = [&] { @@ -6925,7 +6925,7 @@ static PitchAndRoll PitchAndRollStart(bool useInvertedSprites, TileElement* tile { auto trackType = tileElement->AsTrack()->GetTrackType(); const auto& ted = GetTrackElementDescriptor(trackType); - return PitchAndRoll{ ted.Definition.vangle_start, track_get_actual_bank_3(useInvertedSprites, tileElement) }; + return PitchAndRoll{ ted.Definition.vangle_start, TrackGetActualBank3(useInvertedSprites, tileElement) }; } void Vehicle::UpdateGoKartAttemptSwitchLanes() @@ -7016,7 +7016,7 @@ void Vehicle::UpdateHandleWaterSplash() const { if (IsHead()) { - if (track_element_is_covered(trackType)) + if (TrackElementIsCovered(trackType)) { Vehicle* nextVehicle = GetEntity(next_vehicle_on_ride); if (nextVehicle == nullptr) @@ -7025,7 +7025,7 @@ void Vehicle::UpdateHandleWaterSplash() const Vehicle* nextNextVehicle = GetEntity(nextVehicle->next_vehicle_on_ride); if (nextNextVehicle == nullptr) return; - if (!track_element_is_covered(nextNextVehicle->GetTrackType())) + if (!TrackElementIsCovered(nextNextVehicle->GetTrackType())) { if (track_progress == 4) { @@ -7341,7 +7341,7 @@ void Vehicle::Sub6DBF3E() int32_t outputZ, outputDirection; CoordsXYE input = { TrackLocation, tileElement }; - if (!track_block_get_next(&input, &output, &outputZ, &outputDirection)) + if (!TrackBlockGetNext(&input, &output, &outputZ, &outputDirection)) { _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_12; } @@ -7455,7 +7455,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Rid if (isGoingBack) { track_begin_end trackBeginEnd; - if (!track_block_get_previous({ TrackLocation, tileElement }, &trackBeginEnd)) + if (!TrackBlockGetPrevious({ TrackLocation, tileElement }, &trackBeginEnd)) { return false; } @@ -7470,7 +7470,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Rid { int32_t curZ, direction; CoordsXYE xyElement = { TrackLocation, tileElement }; - if (!track_block_get_next(&xyElement, &xyElement, &curZ, &direction)) + if (!TrackBlockGetNext(&xyElement, &xyElement, &curZ, &direction)) { return false; } @@ -7494,7 +7494,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Rid // Update VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES flag ClearUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES); { - int32_t rideType = get_ride(tileElement->AsTrack()->GetRideIndex())->type; + int32_t rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type; if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE)) { if (tileElement->AsTrack()->IsInverted()) @@ -7617,7 +7617,7 @@ loc_6DAEB9: } else if (trackType == TrackElemType::Booster) { - auto boosterSpeed = get_booster_speed(curRide.type, (brake_speed << 16)); + auto boosterSpeed = GetBoosterSpeed(curRide.type, (brake_speed << 16)); if (boosterSpeed > _vehicleVelocityF64E08) { acceleration = GetRideTypeDescriptor(curRide.type).OperatingSettings.BoosterAcceleration @@ -7809,7 +7809,7 @@ static PitchAndRoll PitchAndRollEnd(const Ride& curRide, bool useInvertedSprites { bool isInverted = useInvertedSprites ^ tileElement->AsTrack()->IsInverted(); const auto& ted = GetTrackElementDescriptor(trackType); - return { ted.Definition.vangle_end, track_get_actual_bank_2(curRide.type, isInverted, ted.Definition.bank_end) }; + return { ted.Definition.vangle_end, TrackGetActualBank2(curRide.type, isInverted, ted.Definition.bank_end) }; } /** @@ -7853,7 +7853,7 @@ bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, const Ri { // loc_6DBB7E:; track_begin_end trackBeginEnd; - if (!track_block_get_previous({ trackPos, tileElement }, &trackBeginEnd)) + if (!TrackBlockGetPrevious({ trackPos, tileElement }, &trackBeginEnd)) { return false; } @@ -7894,7 +7894,7 @@ bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, const Ri input.x = trackPos.x; input.y = trackPos.y; input.element = tileElement; - if (!track_block_get_next(&input, &output, &outputZ, &direction)) + if (!TrackBlockGetNext(&input, &output, &outputZ, &direction)) { return false; } @@ -7998,7 +7998,7 @@ bool Vehicle::UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide if (trackType == TrackElemType::Booster) { - auto boosterSpeed = get_booster_speed(curRide.type, (brake_speed << 16)); + auto boosterSpeed = GetBoosterSpeed(curRide.type, (brake_speed << 16)); if (boosterSpeed < _vehicleVelocityF64E08) { acceleration = GetRideTypeDescriptor(curRide.type).OperatingSettings.BoosterAcceleration << 16; @@ -8245,7 +8245,7 @@ loc_6DC476: int32_t outZ{}; int32_t outDirection{}; CoordsXYE input = { TrackLocation, tileElement }; - if (!track_block_get_next(&input, &output, &outZ, &outDirection)) + if (!TrackBlockGetNext(&input, &output, &outZ, &outDirection)) { goto loc_6DC9BC; } @@ -8261,7 +8261,7 @@ loc_6DC476: } { - int32_t rideType = get_ride(tileElement->AsTrack()->GetRideIndex())->type; + int32_t rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type; ClearUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES); if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE)) { @@ -8459,7 +8459,7 @@ loc_6DCA9A: tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, GetTrackType(), 0); { track_begin_end trackBeginEnd; - if (!track_block_get_previous({ TrackLocation, tileElement }, &trackBeginEnd)) + if (!TrackBlockGetPrevious({ TrackLocation, tileElement }, &trackBeginEnd)) { goto loc_6DC9BC; } @@ -8475,7 +8475,7 @@ loc_6DCA9A: } { - int32_t rideType = get_ride(tileElement->AsTrack()->GetRideIndex())->type; + int32_t rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type; ClearUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES); if (GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE)) { @@ -9101,7 +9101,7 @@ int32_t Vehicle::UpdateTrackMotion(int32_t* outStation) { if (vehicle->IsHead()) { - if (track_element_is_covered(vehicle->GetTrackType())) + if (TrackElementIsCovered(vehicle->GetTrackType())) { if (vehicle->velocity > 0x20000) { @@ -9136,7 +9136,7 @@ CarEntry* Vehicle::Entry() const Ride* Vehicle::GetRide() const { - return get_ride(ride); + return ::GetRide(ride); } int32_t Vehicle::NumPeepsUntilTrainTail() const @@ -9236,14 +9236,14 @@ void Vehicle::UpdateCrossings() const if (travellingForwards) { - if (!track_block_get_next(&xyElement, &xyElement, &curZ, &direction)) + if (!TrackBlockGetNext(&xyElement, &xyElement, &curZ, &direction)) { break; } } else { - if (!track_block_get_previous(xyElement, &output)) + if (!TrackBlockGetPrevious(xyElement, &output)) { break; } @@ -9275,7 +9275,7 @@ void Vehicle::UpdateCrossings() const pathElement->SetIsBlockedByVehicle(false); } - if (travellingForwards && freeCount > 0 && track_block_get_previous(xyElement, &output)) + if (travellingForwards && freeCount > 0 && TrackBlockGetPrevious(xyElement, &output)) { xyElement.x = output.begin_x; xyElement.y = output.begin_y; diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 44bfae8dd5..51f46becb1 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -527,10 +527,10 @@ enum #define VEHICLE_SEAT_PAIR_FLAG 0x80 #define VEHICLE_SEAT_NUM_MASK 0x7F -Vehicle* try_get_vehicle(EntityId spriteIndex); -void vehicle_update_all(); -void vehicle_sounds_update(); -uint16_t vehicle_get_move_info_size(VehicleTrackSubposition trackSubposition, track_type_t type, uint8_t direction); +Vehicle* TryGetVehicle(EntityId spriteIndex); +void VehicleUpdateAll(); +void VehicleSoundsUpdate(); +uint16_t VehicleGetMoveInfoSize(VehicleTrackSubposition trackSubposition, track_type_t type, uint8_t direction); void RideUpdateMeasurementsSpecialElements_Default(Ride& ride, const track_type_t trackType); void RideUpdateMeasurementsSpecialElements_MiniGolf(Ride& ride, const track_type_t trackType); diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index 53f4acdef8..30663ab222 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -1004,7 +1004,7 @@ static void vehicle_sprite_paint( { PaintVehicleRiders(session, vehicle, carEntry, baseImageId, z, bb); } - vehicle_visual_splash_effect(session, z, vehicle, carEntry); + VehicleVisualSplashEffect(session, z, vehicle, carEntry); } // 6D520E @@ -3621,7 +3621,7 @@ static void vehicle_visual_splash5_effect(PaintSession& session, int32_t z, cons { return; } - if (!track_element_is_covered(vehicle->GetTrackType())) + if (!TrackElementIsCovered(vehicle->GetTrackType())) { return; } @@ -3630,7 +3630,7 @@ static void vehicle_visual_splash5_effect(PaintSession& session, int32_t z, cons PaintAddImageAsChild(session, ImageId(image_id), { 0, 0, z }, { { 0, 0, z }, { 1, 1, 0 } }); } -void vehicle_visual_splash_effect(PaintSession& session, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) +void VehicleVisualSplashEffect(PaintSession& session, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { switch (carEntry->effect_visual) { @@ -3658,7 +3658,7 @@ void vehicle_visual_splash_effect(PaintSession& session, int32_t z, const Vehicl * * rct2: 0x006D45F8 */ -void vehicle_visual_default( +void VehicleVisualDefault( PaintSession& session, int32_t imageDirection, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { if (vehicle->Pitch < std::size(PaintFunctionsByPitch)) @@ -3708,37 +3708,37 @@ void Vehicle::Paint(PaintSession& session, int32_t imageDirection) const switch (carEntry->PaintStyle) { case VEHICLE_VISUAL_DEFAULT: - vehicle_visual_default(session, imageDirection, z + zOffset, this, carEntry); + VehicleVisualDefault(session, imageDirection, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_LAUNCHED_FREEFALL: - vehicle_visual_launched_freefall(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualLaunchedFreefall(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_OBSERVATION_TOWER: VehicleVisualObservationTower(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_RIVER_RAPIDS: - vehicle_visual_river_rapids(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualRiverRapids(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_MINI_GOLF_PLAYER: - vehicle_visual_mini_golf_player(session, x, imageDirection, y, z + zOffset, this); + VehicleVisualMiniGolfPlayer(session, x, imageDirection, y, z + zOffset, this); break; case VEHICLE_VISUAL_MINI_GOLF_BALL: VehicleVisualMiniGolfBall(session, x, imageDirection, y, z + zOffset, this); break; case VEHICLE_VISUAL_REVERSER: - vehicle_visual_reverser(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualReverser(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_SPLASH_BOATS_OR_WATER_COASTER: - vehicle_visual_splash_boats_or_water_coaster(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualSplashBoatsOrWaterCoaster(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_ROTO_DROP: - vehicle_visual_roto_drop(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualRotoDrop(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_VIRGINIA_REEL: - vehicle_visual_virginia_reel(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualVirginiaReel(session, x, imageDirection, y, z + zOffset, this, carEntry); break; case VEHICLE_VISUAL_SUBMARINE: - vehicle_visual_submarine(session, x, imageDirection, y, z + zOffset, this, carEntry); + VehicleVisualSubmarine(session, x, imageDirection, y, z + zOffset, this, carEntry); break; } } diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h index b8402aa6c7..afe2687e2e 100644 --- a/src/openrct2/ride/VehiclePaint.h +++ b/src/openrct2/ride/VehiclePaint.h @@ -27,34 +27,34 @@ struct vehicle_boundbox extern const vehicle_boundbox VehicleBoundboxes[16][224]; -void vehicle_visual_default( +void VehicleVisualDefault( PaintSession& session, int32_t imageDirection, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_roto_drop( +void VehicleVisualRotoDrop( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); void VehicleVisualObservationTower( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_river_rapids( +void VehicleVisualRiverRapids( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_reverser( +void VehicleVisualReverser( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_splash_boats_or_water_coaster( +void VehicleVisualSplashBoatsOrWaterCoaster( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_launched_freefall( +void VehicleVisualLaunchedFreefall( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_splash_effect(PaintSession& session, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_virginia_reel( +void VehicleVisualSplashEffect(PaintSession& session, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); +void VehicleVisualVirginiaReel( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_submarine( +void VehicleVisualSubmarine( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry); -void vehicle_visual_mini_golf_player( +void VehicleVisualMiniGolfPlayer( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle); void VehicleVisualMiniGolfBall( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle); diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index dcf8d2fdf9..f3936bd087 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -26,7 +26,7 @@ * * rct2: 0x006D4453 */ -void vehicle_visual_reverser( +void VehicleVisualReverser( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { @@ -41,7 +41,7 @@ void vehicle_visual_reverser( z = (v1->z + v2->z) / 2; session.SpritePosition.x = x; session.SpritePosition.y = y; - vehicle_visual_default(session, imageDirection, z, vehicle, carEntry); + VehicleVisualDefault(session, imageDirection, z, vehicle, carEntry); } #endif diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 52a7088fac..3f20534c22 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -163,7 +163,7 @@ static constexpr const uint32_t virginia_reel_track_pieces_flat_quarter_turn_1_t * * rct2: 0x006D5B48 */ -void vehicle_visual_virginia_reel( +void VehicleVisualVirginiaReel( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 99a60ab3c2..6d01b26fa3 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -52,7 +52,7 @@ static void PaintCrookedHouseStructure( if (tileElement == nullptr) return; - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr) return; diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index a38ec8a479..2f330ab467 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -1182,7 +1182,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniGolf(int32_t trackType) /** * rct2: 0x006D42F0 */ -void vehicle_visual_mini_golf_player( +void VehicleVisualMiniGolfPlayer( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle) { if (vehicle->num_peeps == 0) diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index a452184132..8dd40f963a 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -29,7 +29,7 @@ enum * * rct2: 0x006D5FAB */ -void vehicle_visual_launched_freefall( +void VehicleVisualLaunchedFreefall( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 509c4f9fb7..3c59e580a1 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -33,7 +33,7 @@ enum * * rct2: 0x006D5DA9 */ -void vehicle_visual_roto_drop( +void VehicleVisualRotoDrop( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index 1d16268cbf..203b76a56d 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -177,7 +177,7 @@ static constexpr const uint32_t river_rapids_track_pieces_25_deg_down_to_flat[][ * * rct2: 0x006D5889 */ -void vehicle_visual_river_rapids( +void VehicleVisualRiverRapids( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { @@ -263,7 +263,7 @@ void vehicle_visual_river_rapids( } } - vehicle_visual_splash_effect(session, z, vehicle, carEntry); + VehicleVisualSplashEffect(session, z, vehicle, carEntry); } #endif diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 0ec68ef9b7..4266afa710 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -1246,7 +1246,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(int32_t trackType) * * rct2: 0x006D4295 */ -void vehicle_visual_splash_boats_or_water_coaster( +void VehicleVisualSplashBoatsOrWaterCoaster( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index dee4bfda86..362dd5e421 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -41,7 +41,7 @@ static uint32_t SubmarineVehicleGetBaseImageId(const Vehicle* vehicle, const Car * * rct2: 0x006D44D5 */ -void vehicle_visual_submarine( +void VehicleVisualSubmarine( PaintSession& session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry) { diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index b0f275cb0b..3e5c49c422 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -156,7 +156,7 @@ void scenario_reset() park.ResetHistories(); finance_reset_history(); award_reset(); - reset_all_ride_build_dates(); + ResetAllRideBuildDates(); DateReset(); Duck::RemoveAll(); ParkCalculateSize(); @@ -332,8 +332,8 @@ static void scenario_week_update() finance_pay_interest(); marketing_update(); peep_problem_warnings_update(); - ride_check_all_reachable(); - ride_update_favourited_stat(); + RideCheckAllReachable(); + RideUpdateFavouritedStat(); auto water_type = static_cast(object_entry_get_chunk(ObjectType::Water, 0)); @@ -548,7 +548,7 @@ static ResultWithMessage scenario_prepare_rides_for_save() if (rideEntry != nullptr) { // If there are more than 5 roller coasters, only mark the first five. - if (isFiveCoasterObjective && (ride_entry_has_category(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && rcs < 5)) + if (isFiveCoasterObjective && (RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && rcs < 5)) { ride.lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK; rcs++; @@ -576,7 +576,7 @@ static ResultWithMessage scenario_prepare_rides_for_save() if (isFiveCoasterObjective) { - auto ride = get_ride(it.element->AsTrack()->GetRideIndex()); + auto ride = GetRide(it.element->AsTrack()->GetRideIndex()); // In the previous step, this flag was set on the first five roller coasters. if (ride != nullptr && ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) @@ -672,7 +672,7 @@ ObjectiveStatus Objective::Check10RollerCoasters() const auto rideEntry = ride.GetRideEntry(); if (rideEntry != nullptr) { - if (ride_entry_has_category(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) + if (RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) { type_already_counted[ride.subtype] = true; rcs++; @@ -772,7 +772,7 @@ ObjectiveStatus Objective::Check10RollerCoastersLength() const auto rideEntry = ride.GetRideEntry(); if (rideEntry != nullptr) { - if (ride_entry_has_category(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) + if (RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) { if ((ride.GetTotalLength() >> 16) >= MinimumLength) { @@ -804,7 +804,7 @@ ObjectiveStatus Objective::CheckFinish5RollerCoasters() const if (rideEntry != nullptr) { if ((ride.lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) - && ride_entry_has_category(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER)) + && RideEntryHasCategory(*rideEntry, RIDE_CATEGORY_ROLLERCOASTER)) { rcs++; } diff --git a/src/openrct2/scripting/bindings/ride/ScRide.cpp b/src/openrct2/scripting/bindings/ride/ScRide.cpp index b00a239ca5..f454925c22 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.cpp @@ -486,7 +486,7 @@ namespace OpenRCT2::Scripting Ride* ScRide::GetRide() const { - return get_ride(_rideId); + return ::GetRide(_rideId); } uint8_t ScRide::downtime_get() const diff --git a/src/openrct2/scripting/bindings/ride/ScRideStation.cpp b/src/openrct2/scripting/bindings/ride/ScRideStation.cpp index 5ca6001e6d..529a5ff447 100644 --- a/src/openrct2/scripting/bindings/ride/ScRideStation.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRideStation.cpp @@ -118,7 +118,7 @@ namespace OpenRCT2::Scripting RideStation* ScRideStation::GetRideStation() const { - auto ride = get_ride(_rideId); + auto ride = GetRide(_rideId); if (ride != nullptr) { if (_stationIndex.ToUnderlying() < std::size(ride->GetStations())) diff --git a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp index ec7585d479..fe103a5b41 100644 --- a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp +++ b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp @@ -81,7 +81,7 @@ DukValue ScTrackIterator::previousPosition_get() const auto posEl = CoordsXYE(pos.x, pos.y, reinterpret_cast(el)); track_begin_end tbe{}; - track_block_get_previous(posEl, &tbe); + TrackBlockGetPrevious(posEl, &tbe); CoordsXYZD result(tbe.end_x, tbe.end_y, tbe.begin_z, tbe.begin_direction); return ToDuk(ctx, result); } @@ -103,7 +103,7 @@ DukValue ScTrackIterator::nextPosition_get() const CoordsXYE next; int32_t z{}; int32_t direction{}; - track_block_get_next(&posEl, &next, &z, &direction); + TrackBlockGetNext(&posEl, &next, &z, &direction); CoordsXYZD result(next.x, next.y, z, direction); return ToDuk(ctx, result); } @@ -120,7 +120,7 @@ bool ScTrackIterator::previous() auto posEl = CoordsXYE(pos.x, pos.y, reinterpret_cast(el)); track_begin_end tbe{}; - if (track_block_get_previous(posEl, &tbe)) + if (TrackBlockGetPrevious(posEl, &tbe)) { auto prev = CoordsXYE(tbe.end_x, tbe.end_y, tbe.begin_element); auto origin = GetTrackSegmentOrigin(prev); @@ -148,7 +148,7 @@ bool ScTrackIterator::next() CoordsXYE next; int32_t z{}; int32_t direction{}; - if (track_block_get_next(&posEl, &next, &z, &direction)) + if (TrackBlockGetNext(&posEl, &next, &z, &direction)) { auto origin = GetTrackSegmentOrigin(next); if (origin) diff --git a/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp b/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp index b5106670f8..2c3f626685 100644 --- a/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp +++ b/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp @@ -146,7 +146,7 @@ DukValue ScTrackSegment::elements_get() const uint16_t ScTrackSegment::getSubpositionLength(uint8_t trackSubposition, uint8_t direction) const { - return vehicle_get_move_info_size(static_cast(trackSubposition), _type, direction); + return VehicleGetMoveInfoSize(static_cast(trackSubposition), _type, direction); } std::vector ScTrackSegment::getSubpositions(uint8_t trackSubposition, uint8_t direction) const diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index f8385865b6..37948cf249 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -494,7 +494,7 @@ namespace OpenRCT2::Scripting case TileElementType::Track: { auto* el = _element->AsTrack(); - auto* ride = get_ride(el->GetRideIndex()); + auto* ride = GetRide(el->GetRideIndex()); if (ride != nullptr) { @@ -545,7 +545,7 @@ namespace OpenRCT2::Scripting case TileElementType::Track: { auto* el = _element->AsTrack(); - auto ride = get_ride(el->GetRideIndex()); + auto ride = GetRide(el->GetRideIndex()); if (ride != nullptr) { @@ -818,7 +818,7 @@ namespace OpenRCT2::Scripting if (el == nullptr) throw DukException() << "Cannot read 'mazeEntry' property, element is not a TrackElement."; - Ride* ride = get_ride(el->GetRideIndex()); + Ride* ride = GetRide(el->GetRideIndex()); if (ride == nullptr) throw DukException() << "Cannot read 'mazeEntry' property, ride is invalid."; @@ -848,7 +848,7 @@ namespace OpenRCT2::Scripting if (el == nullptr) throw DukException() << "Cannot set 'mazeEntry' property, tile element is not a TrackElement."; - auto* ride = get_ride(el->GetRideIndex()); + auto* ride = GetRide(el->GetRideIndex()); if (ride == nullptr) throw DukException() << "Cannot set 'mazeEntry' property, ride is invalid."; @@ -876,7 +876,7 @@ namespace OpenRCT2::Scripting if (el == nullptr) throw DukException() << "Cannot read 'colourScheme' property, tile element is not a TrackElement."; - auto* ride = get_ride(el->GetRideIndex()); + auto* ride = GetRide(el->GetRideIndex()); if (ride == nullptr) throw DukException() << "Cannot read 'colourScheme' property, ride is invalid."; @@ -906,7 +906,7 @@ namespace OpenRCT2::Scripting if (el == nullptr) throw DukException() << "Cannot set 'colourScheme' property, tile element is not a TrackElement."; - auto* ride = get_ride(el->GetRideIndex()); + auto* ride = GetRide(el->GetRideIndex()); if (ride == nullptr) throw DukException() << "Cannot set 'colourScheme', ride is invalid."; @@ -934,7 +934,7 @@ namespace OpenRCT2::Scripting if (el == nullptr) throw DukException() << "Cannot read 'seatRotation' property, tile element is not a TrackElement."; - auto* ride = get_ride(el->GetRideIndex()); + auto* ride = GetRide(el->GetRideIndex()); if (ride == nullptr) throw DukException() << "Cannot read 'seatRotation' property, ride is invalid."; @@ -964,7 +964,7 @@ namespace OpenRCT2::Scripting if (el == nullptr) throw DukException() << "Cannot set 'seatRotation' property, tile element is not a TrackElement."; - auto* ride = get_ride(el->GetRideIndex()); + auto* ride = GetRide(el->GetRideIndex()); if (ride == nullptr) throw DukException() << "Cannot set 'seatRotation' property, ride is invalid."; diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index 75fa19967e..d56c2397bf 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -42,11 +42,11 @@ RideConstructionState _rideConstructionState2; money32 PlaceProvisionalTrackPiece( RideId rideIndex, int32_t trackType, int32_t trackDirection, int32_t liftHillAndAlternativeState, const CoordsXYZ& trackPos) { - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return MONEY32_UNDEFINED; - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); const auto& rtd = ride->GetRideTypeDescriptor(); if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_MAZE)) { @@ -262,7 +262,7 @@ bool WindowRideConstructionUpdateState( liftHillAndInvertedState |= CONSTRUCTION_INVERTED_TRACK_SELECTED; } - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return true; @@ -395,7 +395,7 @@ bool WindowRideConstructionUpdateState( * * rct2: 0x006C84CE */ -void window_ride_construction_update_active_elements() +void WindowRideConstructionUpdateActiveElements() { auto intent = Intent(INTENT_ACTION_RIDE_CONSTRUCTION_UPDATE_ACTIVE_ELEMENTS); ContextBroadcastIntent(&intent); diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 13fc81e9cc..6ae3e1ab7c 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -63,7 +63,7 @@ void Banner::FormatTextTo(Formatter& ft) const } else if (flags & BANNER_FLAG_LINKED_TO_RIDE) { - auto ride = get_ride(ride_index); + auto ride = GetRide(ride_index); if (ride != nullptr) { ride->FormatNameTo(ft); @@ -99,7 +99,7 @@ static RideId BannerGetRideIndexAt(const CoordsXYZ& bannerCoords) continue; RideId rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr || ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) continue; diff --git a/src/openrct2/world/ConstructionClearance.cpp b/src/openrct2/world/ConstructionClearance.cpp index b5ed0bd84d..b167836a41 100644 --- a/src/openrct2/world/ConstructionClearance.cpp +++ b/src/openrct2/world/ConstructionClearance.cpp @@ -95,7 +95,7 @@ static bool MapLoc68BABCShouldContinue( crossingMode == 2 && canBuildCrossing && tileElement->GetType() == TileElementType::Track && tileElement->GetBaseZ() == pos.baseZ && tileElement->AsTrack()->GetTrackType() == TrackElemType::Flat) { - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SUPPORTS_LEVEL_CROSSINGS)) { return true; @@ -292,7 +292,7 @@ void MapGetObstructionErrorText(TileElement* tileElement, GameActions::Result& r res.ErrorMessage = STR_FOOTPATH_IN_THE_WAY; break; case TileElementType::Track: - ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride != nullptr) { res.ErrorMessage = STR_X_IN_THE_WAY; diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index d70c2464b0..537df56c12 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -114,7 +114,7 @@ void RideEntranceExitRemoveGhost() money32 RideEntranceExitPlaceGhost( const Ride& ride, const CoordsXY& entranceExitCoords, Direction direction, int32_t placeType, StationIndex stationNum) { - ride_construction_remove_ghosts(); + RideConstructionRemoveGhosts(); money32 result = RideEntranceExitPlaceGhost(ride.id, entranceExitCoords, direction, placeType, stationNum); if (result != MONEY32_UNDEFINED) diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index d570c4d160..9b89ac0f5a 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -865,7 +865,7 @@ static void loc_6A6D7E( case TileElementType::Track: if (initialTileElementPos.z == tileElement->GetBaseZ()) { - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr) { continue; @@ -951,7 +951,7 @@ static void loc_6A6C85( if (tileElementPos.element->GetType() == TileElementType::Track) { - auto ride = get_ride(tileElementPos.element->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElementPos.element->AsTrack()->GetRideIndex()); if (ride == nullptr) { return; @@ -1211,7 +1211,7 @@ void FootpathUpdateQueueChains() for (auto* queueChainPtr = _footpathQueueChain; queueChainPtr < _footpathQueueChainNext; queueChainPtr++) { RideId rideIndex = *queueChainPtr; - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) continue; @@ -2180,7 +2180,7 @@ bool TileElementWantsPathConnectionTowards(const TileCoordsXYZD& coords, const T case TileElementType::Track: if (tileElement->base_height == coords.z) { - auto ride = get_ride(tileElement->AsTrack()->GetRideIndex()); + auto ride = GetRide(tileElement->AsTrack()->GetRideIndex()); if (ride == nullptr) continue; @@ -2273,7 +2273,7 @@ void FootpathRemoveEdgesAt(const CoordsXY& footpathPos, TileElement* tileElement if (tileElement->GetType() == TileElementType::Track) { auto rideIndex = tileElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return; @@ -2560,7 +2560,7 @@ bool PathElement::IsLevelCrossing(const CoordsXY& coords) const return false; } - auto ride = get_ride(trackElement->GetRideIndex()); + auto ride = GetRide(trackElement->GetRideIndex()); if (ride == nullptr) { return false; diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 92dfc75258..8dda9bc8d5 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -1355,7 +1355,7 @@ void MapRemoveProvisionalElements() } if (WindowFindByClass(WindowClass::RideConstruction) != nullptr) { - ride_remove_provisional_track_piece(); + RideRemoveProvisionalTrackPiece(); RideEntranceExitRemoveGhost(); } // This is in non performant so only make network games suffer for it @@ -1380,7 +1380,7 @@ void MapRestoreProvisionalElements() } if (WindowFindByClass(WindowClass::RideConstruction) != nullptr) { - ride_restore_provisional_track_piece(); + RideRestoreProvisionalTrackPiece(); RideEntranceExitPlaceProvisionalGhost(); } // This is in non performant so only make network games suffer for it diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index a4e6a8d9a8..a229085784 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -106,7 +106,7 @@ static bool MapAnimationInvalidateRideEntrance(const CoordsXYZ& loc) if (tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_RIDE_ENTRANCE) continue; - auto ride = get_ride(tileElement->AsEntrance()->GetRideIndex()); + auto ride = GetRide(tileElement->AsEntrance()->GetRideIndex()); if (ride != nullptr) { auto stationObj = ride->GetStationObject(); diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index be9a8cd8a0..de99d09fce 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -423,7 +423,7 @@ int32_t Park::CalculateParkRating() const for (auto& ride : GetRideManager()) { totalRideUptime += 100 - ride.downtime; - if (ride_has_ratings(ride)) + if (RideHasRatings(ride)) { totalRideExcitement += ride.excitement / 8; totalRideIntensity += ride.intensity / 8; @@ -501,7 +501,7 @@ money64 Park::CalculateRideValue(const Ride& ride) const { const auto& rtd = ride.GetRideTypeDescriptor(); result = ToMoney64FromGBP(ride.value) - * (static_cast(ride_customers_in_last_5_minutes(ride)) + rtd.BonusValue * 4LL); + * (static_cast(RideCustomersInLast5Minutes(ride)) + rtd.BonusValue * 4LL); } return result; } diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index d1aa4280ed..a8e6659e76 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -241,7 +241,7 @@ namespace OpenRCT2::TileInspector tileElement->SetDirection(newRotation); // Update ride's known entrance/exit rotation - auto ride = get_ride(tileElement->AsEntrance()->GetRideIndex()); + auto ride = GetRide(tileElement->AsEntrance()->GetRideIndex()); if (ride != nullptr) { auto stationIndex = tileElement->AsEntrance()->GetStationIndex(); @@ -478,7 +478,7 @@ namespace OpenRCT2::TileInspector if (entranceType != ENTRANCE_TYPE_PARK_ENTRANCE) { // Update the ride's known entrance or exit height - auto ride = get_ride(tileElement->AsEntrance()->GetRideIndex()); + auto ride = GetRide(tileElement->AsEntrance()->GetRideIndex()); if (ride != nullptr) { auto entranceIndex = tileElement->AsEntrance()->GetStationIndex(); @@ -683,7 +683,7 @@ namespace OpenRCT2::TileInspector if (entranceElement == nullptr || entranceElement->GetType() != TileElementType::Entrance) return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE); - auto ride = get_ride(entranceElement->AsEntrance()->GetRideIndex()); + auto ride = GetRide(entranceElement->AsEntrance()->GetRideIndex()); if (ride == nullptr) return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE); @@ -775,7 +775,7 @@ namespace OpenRCT2::TileInspector int16_t originZ = trackElement->GetBaseZ(); uint8_t rotation = trackElement->GetDirection(); auto rideIndex = trackElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE); @@ -859,7 +859,7 @@ namespace OpenRCT2::TileInspector int16_t originZ = trackElement->GetBaseZ(); uint8_t rotation = trackElement->GetDirection(); auto rideIndex = trackElement->AsTrack()->GetRideIndex(); - auto ride = get_ride(rideIndex); + auto ride = GetRide(rideIndex); if (ride == nullptr) return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE); diff --git a/test/tests/MultiLaunch.cpp b/test/tests/MultiLaunch.cpp index 45a4d5ae50..759ab4bc8c 100644 --- a/test/tests/MultiLaunch.cpp +++ b/test/tests/MultiLaunch.cpp @@ -45,7 +45,7 @@ TEST(MultiLaunchTest, all) game_load_init(); // Check ride count to check load was successful - ASSERT_EQ(ride_get_count(), 134); + ASSERT_EQ(RideGetCount(), 134); auto gs = context->GetGameState(); ASSERT_NE(gs, nullptr); auto& date = gs->GetDate(); @@ -59,7 +59,7 @@ TEST(MultiLaunchTest, all) ASSERT_EQ(date.GetMonthTicks(), 7862 + updatesToTest); // Check ride count again - ASSERT_EQ(ride_get_count(), 134); + ASSERT_EQ(RideGetCount(), 134); } SUCCEED(); } diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index 8d124b80d9..315bfe32a8 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -59,7 +59,7 @@ static std::unique_ptr localStartGame(const std::string& parkPath) LoadPalette(); EntityTweener::Get().Reset(); MapAnimationAutoCreate(); - fix_invalid_vehicle_sprite_sizes(); + FixInvalidVehicleSpriteSizes(); gGameSpeed = 1; diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp index a9189d8c88..a74fc7dce4 100644 --- a/test/tests/RideRatings.cpp +++ b/test/tests/RideRatings.cpp @@ -31,7 +31,7 @@ protected: { for (const auto& ride : GetRideManager()) { - ride_ratings_update_ride(ride); + RideRatingsUpdateRide(ride); } } @@ -69,7 +69,7 @@ TEST_F(RideRatings, all) GetContext()->LoadParkFromFile(path); // Check ride count to check load was successful - ASSERT_EQ(ride_get_count(), 134); + ASSERT_EQ(RideGetCount(), 134); CalculateRatingsForAllRides(); diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index c53b0b1fa3..a0c4823665 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -68,7 +68,7 @@ static void GameInit(bool retainSpatialIndices) LoadPalette(); EntityTweener::Get().Reset(); MapAnimationAutoCreate(); - fix_invalid_vehicle_sprite_sizes(); + FixInvalidVehicleSpriteSizes(); gGameSpeed = 1; }