From 917c091e6b6033f7d13070ef3d7d5e0914128a08 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Wed, 18 Jan 2023 00:13:39 +0100 Subject: [PATCH] Rename snake_case functions in OpenRCT2/marketing folder --- .../windows/EditorBottomToolbar.cpp | 4 +- .../windows/EditorInventionsList.cpp | 10 +- .../windows/EditorObjectSelection.cpp | 12 +- src/openrct2-ui/windows/Finances.cpp | 8 +- src/openrct2-ui/windows/NewRide.cpp | 4 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2/Editor.cpp | 2 +- src/openrct2/EditorObjectSelectionSession.cpp | 6 +- src/openrct2/GameState.cpp | 4 +- src/openrct2/actions/GameAction.cpp | 6 +- src/openrct2/actions/ParkMarketingAction.cpp | 2 +- src/openrct2/actions/RideSetVehicleAction.cpp | 2 +- src/openrct2/actions/TrackDesignAction.cpp | 4 +- src/openrct2/entity/Guest.cpp | 4 +- src/openrct2/entity/Staff.cpp | 2 +- src/openrct2/interface/InteractiveConsole.cpp | 8 +- src/openrct2/management/Award.cpp | 78 ++++---- src/openrct2/management/Award.h | 6 +- src/openrct2/management/Finance.cpp | 44 ++--- src/openrct2/management/Finance.h | 34 ++-- src/openrct2/management/Marketing.cpp | 22 +-- src/openrct2/management/Marketing.h | 12 +- src/openrct2/management/Research.cpp | 178 +++++++++--------- src/openrct2/management/Research.h | 60 +++--- src/openrct2/park/ParkFile.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 14 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 22 +-- src/openrct2/world/Park.cpp | 22 +-- src/openrct2/world/Scenery.cpp | 4 +- 33 files changed, 293 insertions(+), 293 deletions(-) diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index e71fe1ec0c..cf8fad059e 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -61,7 +61,7 @@ public: widgets = _editorBottomToolbarWidgets; InitScrollWidgets(); - set_all_scenery_items_invented(); + SetAllSceneryItemsInvented(); } void OnPrepareDraw() override @@ -156,7 +156,7 @@ private: void JumpBackToLandscapeEditor() const { WindowCloseAll(); - set_all_scenery_items_invented(); + SetAllSceneryItemsInvented(); ScenerySetDefaultPlacementConfiguration(); gEditorStep = EditorStep::LandscapeEditor; ContextOpenWindow(WindowClass::Map); diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 5467eb6d24..f95296b52b 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -157,13 +157,13 @@ public: void OnClose() override { - research_remove_flags(); + ResearchRemoveFlags(); // When used in-game (as a cheat) if (!(gScreenFlags & SCREEN_FLAGS_EDITOR)) { gSilentResearch = true; - research_reset_current_item(); + ResearchResetCurrentItem(); gSilentResearch = false; } } @@ -176,16 +176,16 @@ public: Close(); break; case WIDX_RANDOM_SHUFFLE: - research_items_shuffle(); + ResearchItemsShuffle(); Invalidate(); break; case WIDX_MOVE_ITEMS_TO_TOP: - research_items_make_all_researched(); + ResearchItemsMakeAllResearched(); InitScrollWidgets(); Invalidate(); break; case WIDX_MOVE_ITEMS_TO_BOTTOM: - research_items_make_all_unresearched(); + ResearchItemsMakeAllUnresearched(); InitScrollWidgets(); Invalidate(); break; diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index a51754d5bd..42ab0194b0 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -302,14 +302,14 @@ public: if (gScreenFlags & SCREEN_FLAGS_EDITOR) { - research_populate_list_random(); + ResearchPopulateListRandom(); } else { // Used for in-game object selection cheat // This resets the ride selection list and resets research to 0 on current item gSilentResearch = true; - research_reset_current_item(); + ResearchResetCurrentItem(); gSilentResearch = false; } @@ -1496,8 +1496,8 @@ private: */ void ManageTracks() { - set_every_ride_type_invented(); - set_every_ride_entry_invented(); + SetEveryRideTypeInvented(); + SetEveryRideEntryInvented(); gEditorStep = EditorStep::DesignsManager; @@ -1589,11 +1589,11 @@ void EditorLoadSelectedObjects() rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); auto rideType = rideEntry->GetFirstNonNullRideType(); ResearchCategory category = static_cast(GetRideTypeDescriptor(rideType).Category); - research_insert_ride_entry(rideType, entryIndex, category, true); + ResearchInsertRideEntry(rideType, entryIndex, category, true); } else if (objectType == ObjectType::SceneryGroup) { - research_insert_scenery_group_entry(entryIndex, true); + ResearchInsertSceneryGroupEntry(entryIndex, true); } if (loadedObject->UsesFallbackImages()) { diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 689444dae5..0331750be3 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -570,7 +570,7 @@ public: // Objective related financial information if (gScenarioObjective.Type == OBJECTIVE_MONTHLY_FOOD_INCOME) { - auto lastMonthProfit = finance_get_last_month_shop_profit(); + auto lastMonthProfit = FinanceGetLastMonthShopProfit(); ft = Formatter(); ft.Add(lastMonthProfit); DrawTextBasic( @@ -800,8 +800,8 @@ public: for (int32_t i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { auto campaignButton = &_windowFinancesMarketingWidgets[WIDX_CAMPAIGN_1 + i]; - auto marketingCampaign = marketing_get_campaign(i); - if (marketingCampaign == nullptr && marketing_is_campaign_type_applicable(i)) + auto marketingCampaign = MarketingGetCampaign(i); + if (marketingCampaign == nullptr && MarketingIsCampaignTypeApplicable(i)) { campaignButton->type = WindowWidgetType::Button; campaignButton->top = y; @@ -821,7 +821,7 @@ public: int32_t noCampaignsActive = 1; for (int32_t i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { - auto marketingCampaign = marketing_get_campaign(i); + auto marketingCampaign = MarketingGetCampaign(i); if (marketingCampaign == nullptr) continue; diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 1a35e061fd..4434c83af4 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -577,7 +577,7 @@ private: auto currentRideEntry = GetRideEntryByIndex(rideEntryIndex); // Skip if vehicle type is not invented yet - if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) { continue; } @@ -639,7 +639,7 @@ private: for (auto rideEntryIndex : rideEntries) { // Skip if vehicle type is not invented yet - if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) continue; // Ride entries diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index a6fd012b75..d3414d0896 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2034,7 +2034,7 @@ static void PopulateVehicleTypeDropdown(const Ride& ride, bool forceRefresh) continue; // Skip if vehicle type has not been invented yet - if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) continue; VehicleDropdownData.push_back( diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 3b5c504f65..0841ec5dc1 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -746,7 +746,7 @@ public: for (ObjectEntryIndex scenerySetIndex = 0; scenerySetIndex < MaxTabs - 1; scenerySetIndex++) { const auto* sceneryGroupEntry = GetSceneryGroupEntry(scenerySetIndex); - if (sceneryGroupEntry != nullptr && scenery_group_is_invented(scenerySetIndex)) + if (sceneryGroupEntry != nullptr && SceneryGroupIsInvented(scenerySetIndex)) { SceneryTabInfo tabInfo; tabInfo.SceneryGroupIndex = scenerySetIndex; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 26ade90ef8..f5d8905ffc 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -334,7 +334,7 @@ namespace Editor gGuestInitialCash, static_cast(10.00_GBP), static_cast(MAX_ENTRANCE_FEE)); gInitialCash = std::min(gInitialCash, 100000); - finance_reset_cash_to_initial(); + FinanceResetCashToInitial(); gBankLoan = std::clamp(gBankLoan, 0.00_GBP, 5000000.00_GBP); diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index b0e073b2c6..61322addee 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -483,14 +483,14 @@ void FinishObjectSelection() { if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) { - set_every_ride_type_invented(); - set_every_ride_entry_invented(); + SetEveryRideTypeInvented(); + SetEveryRideEntryInvented(); gEditorStep = EditorStep::RollercoasterDesigner; GfxInvalidateScreen(); } else { - set_all_scenery_items_invented(); + SetAllSceneryItemsInvented(); ScenerySetDefaultPlacementConfiguration(); gEditorStep = EditorStep::LandscapeEditor; GfxInvalidateScreen(); diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 01b984e45b..76c3706a69 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -65,7 +65,7 @@ void GameState::InitAll(const TileCoordsXY& mapSize) MapInit(mapSize); _park->Initialise(); - finance_init(); + FinanceInit(); BannerInit(); RideInitAll(); ResetAllEntities(); @@ -345,7 +345,7 @@ void GameState::UpdateLogic(LogicTimings* timings) } report_time(LogicTimePart::Park); - research_update(); + ResearchUpdate(); report_time(LogicTimePart::Research); RideRatingsUpdateAll(); report_time(LogicTimePart::RideRatings); diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index c4cd2a1091..c63ca0c983 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -210,7 +210,7 @@ namespace GameActions if (result.Error == GameActions::Status::Ok) { - if (!finance_check_affordability(result.Cost, action->GetFlags())) + if (!FinanceCheckAffordability(result.Cost, action->GetFlags())) { result.Error = GameActions::Status::InsufficientFunds; result.ErrorTitle = STR_CANT_DO_THIS; @@ -369,9 +369,9 @@ namespace GameActions return result; // Update money balance - if (result.Error == GameActions::Status::Ok && finance_check_money_required(flags) && result.Cost != 0) + if (result.Error == GameActions::Status::Ok && FinanceCheckMoneyRequired(flags) && result.Cost != 0) { - finance_payment(result.Cost, result.Expenditure); + FinancePayment(result.Cost, result.Expenditure); MoneyEffect::Create(result.Cost, result.Position); } diff --git a/src/openrct2/actions/ParkMarketingAction.cpp b/src/openrct2/actions/ParkMarketingAction.cpp index d377640ed6..9847a26f9f 100644 --- a/src/openrct2/actions/ParkMarketingAction.cpp +++ b/src/openrct2/actions/ParkMarketingAction.cpp @@ -76,7 +76,7 @@ GameActions::Result ParkMarketingAction::Execute() const { campaign.ShopItemType = ShopItem(_item); } - marketing_new_campaign(campaign); + MarketingNewCampaign(campaign); // We are only interested in invalidating the finances (marketing) window auto windowManager = OpenRCT2::GetContext()->GetUiContext()->GetWindowManager(); diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index 99ca88f5c4..92e2cd6a71 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -250,7 +250,7 @@ bool RideSetVehicleAction::RideIsVehicleTypeValid(const Ride& ride) const { if (rideEntryIndex == _value) { - if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) { return false; } diff --git a/src/openrct2/actions/TrackDesignAction.cpp b/src/openrct2/actions/TrackDesignAction.cpp index 27a4fbcd79..b79f14ede3 100644 --- a/src/openrct2/actions/TrackDesignAction.cpp +++ b/src/openrct2/actions/TrackDesignAction.cpp @@ -68,7 +68,7 @@ GameActions::Result TrackDesignAction::Query() const { // Force a fallback if the entry is not invented yet a td6 of it is selected, // which can happen in select-by-track-type mode - if (!ride_entry_is_invented(entryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(entryIndex) && !gCheatsIgnoreResearchStatus) { entryIndex = OBJECT_ENTRY_INDEX_NULL; } @@ -140,7 +140,7 @@ GameActions::Result TrackDesignAction::Execute() const { // Force a fallback if the entry is not invented yet a track design using it is selected. // This can happen on rides with multiple vehicles where some have been invented and some haven’t. - if (!ride_entry_is_invented(entryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(entryIndex) && !gCheatsIgnoreResearchStatus) { entryIndex = OBJECT_ENTRY_INDEX_NULL; } diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 89f7d69217..0c7da8357e 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1684,7 +1684,7 @@ bool Guest::DecideAndBuyItem(Ride& ride, ShopItem shopItem, money32 price) } if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) - finance_payment(GetShopItemDescriptor(shopItem).Cost, expenditure); + FinancePayment(GetShopItemDescriptor(shopItem).Cost, expenditure); // Sets the expenditure type to *_FOODDRINK_SALES or *_SHOP_SALES appropriately. expenditure = static_cast(static_cast(expenditure) - 1); @@ -2296,7 +2296,7 @@ void Guest::SpendMoney(money16& peep_expend_type, money32 amount, ExpenditureTyp WindowInvalidateByNumber(WindowClass::Peep, sprite_index); - finance_payment(-amount, expenditure); + FinancePayment(-amount, expenditure); if (gConfigGeneral.ShowGuestPurchases && !(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) { diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index c106b0eb3a..5d37e88bfc 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -1028,7 +1028,7 @@ uint32_t StaffGetAvailableEntertainerCostumes() uint32_t entertainerCostumes = 0; for (int32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) { - if (scenery_group_is_invented(i)) + if (SceneryGroupIsInvented(i)) { const auto sgEntry = GetSceneryGroupEntry(i); entertainerCostumes |= sgEntry->entertainer_costumes; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 310ab3bbf8..7f1eaeacf1 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1243,20 +1243,20 @@ static int32_t ConsoleCommandLoadObject(InteractiveConsole& console, const argum if (rideType != RIDE_TYPE_NULL) { ResearchCategory category = GetRideTypeDescriptor(rideType).GetResearchCategory(); - research_insert_ride_entry(rideType, groupIndex, category, true); + ResearchInsertRideEntry(rideType, groupIndex, category, true); } } gSilentResearch = true; - research_reset_current_item(); + ResearchResetCurrentItem(); gSilentResearch = false; } else if (objectType == ObjectType::SceneryGroup) { - research_insert_scenery_group_entry(groupIndex, true); + ResearchInsertSceneryGroupEntry(groupIndex, true); gSilentResearch = true; - research_reset_current_item(); + ResearchResetCurrentItem(); gSilentResearch = false; } ScenerySetDefaultPlacementConfiguration(); diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 29da4635b6..020265d48d 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -73,7 +73,7 @@ std::vector& GetAwards() return _currentAwards; } -bool award_is_positive(AwardType type) +bool AwardIsPositive(AwardType type) { return AwardPositiveMap[EnumValue(type)]; } @@ -81,7 +81,7 @@ bool award_is_positive(AwardType type) #pragma region Award checks /** More than 1/16 of the total guests must be thinking untidy thoughts. */ -static bool award_is_deserved_most_untidy(int32_t activeAwardTypes) +static bool AwardIsDeservedMostUntidy(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::MostBeautiful)) return false; @@ -111,7 +111,7 @@ static bool award_is_deserved_most_untidy(int32_t activeAwardTypes) } /** More than 1/64 of the total guests must be thinking tidy thoughts and less than 6 guests thinking untidy thoughts. */ -static bool award_is_deserved_most_tidy(int32_t activeAwardTypes) +static bool AwardIsDeservedMostTidy(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::MostUntidy)) return false; @@ -143,7 +143,7 @@ static bool award_is_deserved_most_tidy(int32_t activeAwardTypes) } /** At least 6 open roller coasters. */ -static bool award_is_deserved_best_rollercoasters([[maybe_unused]] int32_t activeAwardTypes) +static bool AwardIsDeservedBestRollercoasters([[maybe_unused]] int32_t activeAwardTypes) { auto rollerCoasters = 0; for (const auto& ride : GetRideManager()) @@ -170,7 +170,7 @@ static bool award_is_deserved_best_rollercoasters([[maybe_unused]] int32_t activ } /** Entrance fee is 0.10 less than half of the total ride value. */ -static bool award_is_deserved_best_value(int32_t activeAwardTypes) +static bool AwardIsDeservedBestValue(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::WorstValue)) return false; @@ -191,7 +191,7 @@ static bool award_is_deserved_best_value(int32_t activeAwardTypes) } /** More than 1/128 of the total guests must be thinking scenic thoughts and fewer than 16 untidy thoughts. */ -static bool award_is_deserved_most_beautiful(int32_t activeAwardTypes) +static bool AwardIsDeservedMostBeautiful(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::MostUntidy)) return false; @@ -224,7 +224,7 @@ static bool award_is_deserved_most_beautiful(int32_t activeAwardTypes) } /** Entrance fee is more than total ride value. */ -static bool award_is_deserved_worst_value(int32_t activeAwardTypes) +static bool AwardIsDeservedWorstValue(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::BestValue)) return false; @@ -240,7 +240,7 @@ static bool award_is_deserved_worst_value(int32_t activeAwardTypes) } /** No more than 2 people who think the vandalism is bad and no crashes. */ -static bool award_is_deserved_safest([[maybe_unused]] int32_t activeAwardTypes) +static bool AwardIsDeservedSafest([[maybe_unused]] int32_t activeAwardTypes) { auto peepsWhoDislikeVandalism = 0; for (auto peep : EntityList()) @@ -269,7 +269,7 @@ static bool award_is_deserved_safest([[maybe_unused]] int32_t activeAwardTypes) } /** All staff types, at least 20 staff, one staff per 32 peeps. */ -static bool award_is_deserved_best_staff(int32_t activeAwardTypes) +static bool AwardIsDeservedBestStaff(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::MostUntidy)) return false; @@ -281,7 +281,7 @@ static bool award_is_deserved_best_staff(int32_t activeAwardTypes) } /** At least 7 shops, 4 unique, one shop per 128 guests and no more than 12 hungry guests. */ -static bool award_is_deserved_best_food(int32_t activeAwardTypes) +static bool AwardIsDeservedBestFood(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::WorstFood)) return false; @@ -326,7 +326,7 @@ static bool award_is_deserved_best_food(int32_t activeAwardTypes) } /** No more than 2 unique shops, less than one shop per 256 guests and more than 15 hungry guests. */ -static bool award_is_deserved_worst_food(int32_t activeAwardTypes) +static bool AwardIsDeservedWorstFood(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::BestFood)) return false; @@ -371,7 +371,7 @@ static bool award_is_deserved_worst_food(int32_t activeAwardTypes) } /** At least 4 toilets, 1 toilet per 128 guests and no more than 16 guests who think they need the toilet. */ -static bool award_is_deserved_best_toilets([[maybe_unused]] int32_t activeAwardTypes) +static bool AwardIsDeservedBestToilets([[maybe_unused]] int32_t activeAwardTypes) { // Count open toilets const auto& rideManager = GetRideManager(); @@ -403,7 +403,7 @@ static bool award_is_deserved_best_toilets([[maybe_unused]] int32_t activeAwardT } /** More than half of the rides have satisfaction <= 6 and park rating <= 650. */ -static bool award_is_deserved_most_disappointing(int32_t activeAwardTypes) +static bool AwardIsDeservedMostDisappointing(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::BestValue)) return false; @@ -430,7 +430,7 @@ static bool award_is_deserved_most_disappointing(int32_t activeAwardTypes) } /** At least 6 open water rides. */ -static bool award_is_deserved_best_water_rides([[maybe_unused]] int32_t activeAwardTypes) +static bool AwardIsDeservedBestWaterRides([[maybe_unused]] int32_t activeAwardTypes) { auto waterRides = 0; for (const auto& ride : GetRideManager()) @@ -458,7 +458,7 @@ static bool award_is_deserved_best_water_rides([[maybe_unused]] int32_t activeAw } /** At least 6 custom designed rides. */ -static bool award_is_deserved_best_custom_designed_rides(int32_t activeAwardTypes) +static bool AwardIsDeservedBestCustomDesignedRides(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::MostDisappointing)) return false; @@ -481,7 +481,7 @@ static bool award_is_deserved_best_custom_designed_rides(int32_t activeAwardType return (customDesignedRides >= 6); } -static bool award_is_deserved_most_dazzling_ride_colours(int32_t activeAwardTypes) +static bool AwardIsDeservedMostDazzlingRideColours(int32_t activeAwardTypes) { /** At least 5 colourful rides and more than half of the rides are colourful. */ static constexpr const colour_t dazzling_ride_colours[] = { @@ -518,7 +518,7 @@ static bool award_is_deserved_most_dazzling_ride_colours(int32_t activeAwardType } /** At least 10 peeps and more than 1/64 of total guests are lost or can't find something. */ -static bool award_is_deserved_most_confusing_layout([[maybe_unused]] int32_t activeAwardTypes) +static bool AwardIsDeservedMostConfusingLayout([[maybe_unused]] int32_t activeAwardTypes) { uint32_t peepsCounted = 0; uint32_t peepsLost = 0; @@ -537,7 +537,7 @@ static bool award_is_deserved_most_confusing_layout([[maybe_unused]] int32_t act } /** At least 10 open gentle rides. */ -static bool award_is_deserved_best_gentle_rides([[maybe_unused]] int32_t activeAwardTypes) +static bool AwardIsDeservedBestGentleRides([[maybe_unused]] int32_t activeAwardTypes) { auto gentleRides = 0; for (const auto& ride : GetRideManager()) @@ -567,33 +567,33 @@ static bool award_is_deserved_best_gentle_rides([[maybe_unused]] int32_t activeA using award_deserved_check = bool (*)(int32_t); static constexpr const award_deserved_check _awardChecks[] = { - award_is_deserved_most_untidy, - award_is_deserved_most_tidy, - award_is_deserved_best_rollercoasters, - award_is_deserved_best_value, - award_is_deserved_most_beautiful, - award_is_deserved_worst_value, - award_is_deserved_safest, - award_is_deserved_best_staff, - award_is_deserved_best_food, - award_is_deserved_worst_food, - award_is_deserved_best_toilets, - award_is_deserved_most_disappointing, - award_is_deserved_best_water_rides, - award_is_deserved_best_custom_designed_rides, - award_is_deserved_most_dazzling_ride_colours, - award_is_deserved_most_confusing_layout, - award_is_deserved_best_gentle_rides, + AwardIsDeservedMostUntidy, + AwardIsDeservedMostTidy, + AwardIsDeservedBestRollercoasters, + AwardIsDeservedBestValue, + AwardIsDeservedMostBeautiful, + AwardIsDeservedWorstValue, + AwardIsDeservedSafest, + AwardIsDeservedBestStaff, + AwardIsDeservedBestFood, + AwardIsDeservedWorstFood, + AwardIsDeservedBestToilets, + AwardIsDeservedMostDisappointing, + AwardIsDeservedBestWaterRides, + AwardIsDeservedBestCustomDesignedRides, + AwardIsDeservedMostDazzlingRideColours, + AwardIsDeservedMostConfusingLayout, + AwardIsDeservedBestGentleRides, }; -static bool award_is_deserved(AwardType awardType, int32_t activeAwardTypes) +static bool AwardIsDeserved(AwardType awardType, int32_t activeAwardTypes) { return _awardChecks[EnumValue(awardType)](activeAwardTypes); } #pragma endregion -void award_reset() +void AwardReset() { _currentAwards.clear(); } @@ -602,7 +602,7 @@ void award_reset() * * rct2: 0x0066A86C */ -void award_update_all() +void AwardUpdateAll() { PROFILED_FUNCTION(); @@ -641,7 +641,7 @@ void award_update_all() } while (activeAwardTypes & (1 << EnumValue(awardType))); // Check if award is deserved - if (award_is_deserved(awardType, activeAwardTypes)) + if (AwardIsDeserved(awardType, activeAwardTypes)) { // Add award _currentAwards.push_back(Award{ 5u, awardType }); diff --git a/src/openrct2/management/Award.h b/src/openrct2/management/Award.h index f409bb4a05..09784535bf 100644 --- a/src/openrct2/management/Award.h +++ b/src/openrct2/management/Award.h @@ -44,6 +44,6 @@ struct Award std::vector& GetAwards(); -bool award_is_positive(AwardType type); -void award_reset(); -void award_update_all(); +bool AwardIsPositive(AwardType type); +void AwardReset(); +void AwardUpdateAll(); diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 4fd8f1ad45..c8247dbb79 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -55,7 +55,7 @@ money64 gExpenditureTable[EXPENDITURE_TABLE_MONTH_COUNT][static_cast(Ex * Checks the condition if the game is required to use money. * @param flags game command flags. */ -bool finance_check_money_required(uint32_t flags) +bool FinanceCheckMoneyRequired(uint32_t flags) { if (gParkFlags & PARK_FLAGS_NO_MONEY) return false; @@ -73,9 +73,9 @@ bool finance_check_money_required(uint32_t flags) * @param cost. * @param flags game command flags. */ -bool finance_check_affordability(money64 cost, uint32_t flags) +bool FinanceCheckAffordability(money64 cost, uint32_t flags) { - return !finance_check_money_required(flags) || cost <= 0 || cost <= gCash; + return !FinanceCheckMoneyRequired(flags) || cost <= 0 || cost <= gCash; } /** @@ -84,7 +84,7 @@ bool finance_check_affordability(money64 cost, uint32_t flags) * @param amount (eax) * @param type passed via global var 0x0141F56C (RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE), our type is that var/4. */ -void finance_payment(money64 amount, ExpenditureType type) +void FinancePayment(money64 amount, ExpenditureType type) { // overflow check gCash = add_clamp_money64(gCash, -amount); @@ -104,7 +104,7 @@ void finance_payment(money64 amount, ExpenditureType type) * Pays the wages of all active staff members in the park. * rct2: 0x006C18A9 */ -void finance_pay_wages() +void FinancePayWages() { PROFILED_FUNCTION(); @@ -115,7 +115,7 @@ void finance_pay_wages() for (auto peep : EntityList()) { - finance_payment(GetStaffWage(peep->AssignedStaffType) / 4, ExpenditureType::Wages); + FinancePayment(GetStaffWage(peep->AssignedStaffType) / 4, ExpenditureType::Wages); } } @@ -123,7 +123,7 @@ void finance_pay_wages() * Pays the current research level's cost. * rct2: 0x00684DA5 **/ -void finance_pay_research() +void FinancePayResearch() { if (gParkFlags & PARK_FLAGS_NO_MONEY) { @@ -131,14 +131,14 @@ void finance_pay_research() } const uint8_t level = gResearchFundingLevel; - finance_payment(research_cost_table[level] / 4, ExpenditureType::Research); + FinancePayment(research_cost_table[level] / 4, ExpenditureType::Research); } /** * Pay interest on current loans. * rct2: 0x0069E092 */ -void finance_pay_interest() +void FinancePayInterest() { if (gParkFlags & PARK_FLAGS_NO_MONEY) { @@ -151,14 +151,14 @@ void finance_pay_interest() const uint8_t current_interest_rate = gBankLoanInterestRate; const money32 interest_to_pay = (current_loan * 5 * current_interest_rate) >> 14; - finance_payment(interest_to_pay, ExpenditureType::Interest); + FinancePayment(interest_to_pay, ExpenditureType::Interest); } /** * * rct2: 0x006AC885 */ -void finance_pay_ride_upkeep() +void FinancePayRideUpkeep() { PROFILED_FUNCTION(); @@ -176,7 +176,7 @@ void finance_pay_ride_upkeep() { ride.total_profit -= upkeep; ride.window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - finance_payment(upkeep, ExpenditureType::RideRunningCosts); + FinancePayment(upkeep, ExpenditureType::RideRunningCosts); } } @@ -187,7 +187,7 @@ void finance_pay_ride_upkeep() } } -void finance_reset_history() +void FinanceResetHistory() { for (int32_t i = 0; i < FINANCE_GRAPH_SIZE; i++) { @@ -201,7 +201,7 @@ void finance_reset_history() * * rct2: 0x0069DEFB */ -void finance_init() +void FinanceInit() { // It only initialises the first month for (uint32_t i = 0; i < static_cast(ExpenditureType::Count); i++) @@ -236,7 +236,7 @@ void finance_init() * * rct2: 0x0069E79A */ -void finance_update_daily_profit() +void FinanceUpdateDailyProfit() { PROFILED_FUNCTION(); @@ -283,22 +283,22 @@ void finance_update_daily_profit() WindowInvalidateByClass(WindowClass::Finances); } -money64 finance_get_initial_cash() +money64 FinanceGetInitialCash() { return gInitialCash; } -money64 finance_get_current_loan() +money64 FinanceGetCurrentLoan() { return gBankLoan; } -money64 finance_get_maximum_loan() +money64 FinanceGetMaximumLoan() { return gMaxBankLoan; } -money64 finance_get_current_cash() +money64 FinanceGetCurrentCash() { return gCash; } @@ -308,7 +308,7 @@ money64 finance_get_current_cash() * If the table is full, accumulate the sum of the oldest month first * rct2: 0x0069DEAD */ -void finance_shift_expenditure_table() +void FinanceShiftExpenditureTable() { // If EXPENDITURE_TABLE_MONTH_COUNT months have passed then is full, sum the oldest month if (gDateMonthsElapsed >= EXPENDITURE_TABLE_MONTH_COUNT) @@ -343,7 +343,7 @@ void finance_shift_expenditure_table() * * rct2: 0x0069E89B */ -void finance_reset_cash_to_initial() +void FinanceResetCashToInitial() { gCash = gInitialCash; } @@ -351,7 +351,7 @@ void finance_reset_cash_to_initial() /** * Gets the last month's profit from food, drink and merchandise. */ -money64 finance_get_last_month_shop_profit() +money64 FinanceGetLastMonthShopProfit() { money64 profit = 0; if (gDateMonthsElapsed != 0) diff --git a/src/openrct2/management/Finance.h b/src/openrct2/management/Finance.h index d1c765b9fe..4b586f6084 100644 --- a/src/openrct2/management/Finance.h +++ b/src/openrct2/management/Finance.h @@ -59,22 +59,22 @@ extern money64 gWeeklyProfitHistory[FINANCE_GRAPH_SIZE]; extern money64 gParkValueHistory[FINANCE_GRAPH_SIZE]; extern money64 gExpenditureTable[EXPENDITURE_TABLE_MONTH_COUNT][static_cast(ExpenditureType::Count)]; -bool finance_check_money_required(uint32_t flags); -bool finance_check_affordability(money64 cost, uint32_t flags); -void finance_payment(money64 amount, ExpenditureType type); -void finance_pay_wages(); -void finance_pay_research(); -void finance_pay_interest(); -void finance_pay_ride_upkeep(); -void finance_reset_history(); -void finance_init(); -void finance_update_daily_profit(); -void finance_shift_expenditure_table(); -void finance_reset_cash_to_initial(); +bool FinanceCheckMoneyRequired(uint32_t flags); +bool FinanceCheckAffordability(money64 cost, uint32_t flags); +void FinancePayment(money64 amount, ExpenditureType type); +void FinancePayWages(); +void FinancePayResearch(); +void FinancePayInterest(); +void FinancePayRideUpkeep(); +void FinanceResetHistory(); +void FinanceInit(); +void FinanceUpdateDailyProfit(); +void FinanceShiftExpenditureTable(); +void FinanceResetCashToInitial(); -money64 finance_get_initial_cash(); -money64 finance_get_current_loan(); -money64 finance_get_maximum_loan(); -money64 finance_get_current_cash(); +money64 FinanceGetInitialCash(); +money64 FinanceGetCurrentLoan(); +money64 FinanceGetMaximumLoan(); +money64 FinanceGetCurrentCash(); -money64 finance_get_last_month_shop_profit(); +money64 FinanceGetLastMonthShopProfit(); diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index ab705975f7..350ad2d555 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -39,9 +39,9 @@ static constexpr const uint16_t AdvertisingCampaignGuestGenerationProbabilities[ std::vector gMarketingCampaigns; -uint16_t marketing_get_campaign_guest_generation_probability(int32_t campaignType) +uint16_t MarketingGetCampaignGuestGenerationProbability(int32_t campaignType) { - auto campaign = marketing_get_campaign(campaignType); + auto campaign = MarketingGetCampaign(campaignType); if (campaign == nullptr) return 0; @@ -69,7 +69,7 @@ uint16_t marketing_get_campaign_guest_generation_probability(int32_t campaignTyp return probability; } -static void marketing_raise_finished_notification(const MarketingCampaign& campaign) +static void MarketingRaiseFinishedNotification(const MarketingCampaign& campaign) { if (gConfigNotifications.ParkMarketingCampaignFinished) { @@ -96,7 +96,7 @@ static void marketing_raise_finished_notification(const MarketingCampaign& campa * Update status of marketing campaigns and send produce a news item when they have finished. * rct2: 0x0069E0C1 */ -void marketing_update() +void MarketingUpdate() { PROFILED_FUNCTION(); @@ -119,7 +119,7 @@ void marketing_update() if (campaign.WeeksLeft == 0) { - marketing_raise_finished_notification(campaign); + MarketingRaiseFinishedNotification(campaign); it = gMarketingCampaigns.erase(it); } else @@ -131,9 +131,9 @@ void marketing_update() WindowInvalidateByClass(WindowClass::Finances); } -void marketing_set_guest_campaign(Guest* peep, int32_t campaignType) +void MarketingSetGuestCampaign(Guest* peep, int32_t campaignType) { - auto campaign = marketing_get_campaign(campaignType); + auto campaign = MarketingGetCampaign(campaignType); if (campaign == nullptr) return; @@ -168,7 +168,7 @@ void marketing_set_guest_campaign(Guest* peep, int32_t campaignType) } } -bool marketing_is_campaign_type_applicable(int32_t campaignType) +bool MarketingIsCampaignTypeApplicable(int32_t campaignType) { switch (campaignType) { @@ -217,7 +217,7 @@ bool marketing_is_campaign_type_applicable(int32_t campaignType) } } -MarketingCampaign* marketing_get_campaign(int32_t campaignType) +MarketingCampaign* MarketingGetCampaign(int32_t campaignType) { for (auto& campaign : gMarketingCampaigns) { @@ -229,10 +229,10 @@ MarketingCampaign* marketing_get_campaign(int32_t campaignType) return nullptr; } -void marketing_new_campaign(const MarketingCampaign& campaign) +void MarketingNewCampaign(const MarketingCampaign& campaign) { // Do not allow same campaign twice, just overwrite - auto currentCampaign = marketing_get_campaign(campaign.Type); + auto currentCampaign = MarketingGetCampaign(campaign.Type); if (currentCampaign != nullptr) { *currentCampaign = campaign; diff --git a/src/openrct2/management/Marketing.h b/src/openrct2/management/Marketing.h index 2d6f2d1af1..a341d105f2 100644 --- a/src/openrct2/management/Marketing.h +++ b/src/openrct2/management/Marketing.h @@ -63,10 +63,10 @@ namespace MarketingCampaignFlags extern const money16 AdvertisingCampaignPricePerWeek[ADVERTISING_CAMPAIGN_COUNT]; extern std::vector gMarketingCampaigns; -uint16_t marketing_get_campaign_guest_generation_probability(int32_t campaign); -void marketing_update(); -void marketing_set_guest_campaign(Guest* peep, int32_t campaign); -bool marketing_is_campaign_type_applicable(int32_t campaignType); -MarketingCampaign* marketing_get_campaign(int32_t campaignType); -void marketing_new_campaign(const MarketingCampaign& campaign); +uint16_t MarketingGetCampaignGuestGenerationProbability(int32_t campaign); +void MarketingUpdate(); +void MarketingSetGuestCampaign(Guest* peep, int32_t campaign); +bool MarketingIsCampaignTypeApplicable(int32_t campaignType); +MarketingCampaign* MarketingGetCampaign(int32_t campaignType); +void MarketingNewCampaign(const MarketingCampaign& campaign); void MarketingCancelCampaignsForRide(const RideId rideId); diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index da7ff35cd6..ae0a3a12d7 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -72,7 +72,7 @@ bool gSilentResearch = false; * * rct2: 0x006671AD, part of 0x00667132 */ -void research_reset_items() +void ResearchResetItems() { gResearchItemsUninvented.clear(); gResearchItemsInvented.clear(); @@ -98,7 +98,7 @@ void ResearchUpdateUncompletedTypes() * * rct2: 0x00684D2A */ -static void research_calculate_expected_date() +static void ResearchCalculateExpectedDate() { if (gResearchProgressStage == RESEARCH_STAGE_INITIAL_RESEARCH || gResearchFundingLevel == RESEARCH_FUNDING_NONE) { @@ -122,17 +122,17 @@ static void research_calculate_expected_date() } } -static void research_invalidate_related_windows() +static void ResearchInvalidateRelatedWindows() { WindowInvalidateByClass(WindowClass::ConstructRide); WindowInvalidateByClass(WindowClass::Research); } -static void research_mark_as_fully_completed() +static void ResearchMarkAsFullyCompleted() { gResearchProgress = 0; gResearchProgressStage = RESEARCH_STAGE_FINISHED_ALL; - research_invalidate_related_windows(); + ResearchInvalidateRelatedWindows(); // Reset funding to 0 if no more rides. auto gameAction = ParkSetResearchFundingAction(gResearchPriorities, 0); GameActions::Execute(&gameAction); @@ -142,11 +142,11 @@ static void research_mark_as_fully_completed() * * rct2: 0x00684BE5 */ -static void research_next_design() +static void ResearchNextDesign() { if (gResearchItemsUninvented.empty()) { - research_mark_as_fully_completed(); + ResearchMarkAsFullyCompleted(); return; } @@ -166,7 +166,7 @@ static void research_next_design() continue; } - research_mark_as_fully_completed(); + ResearchMarkAsFullyCompleted(); return; } @@ -184,17 +184,17 @@ static void research_next_design() gResearchItemsUninvented.erase(it); gResearchItemsInvented.push_back(std::move(researchItem)); - research_invalidate_related_windows(); + ResearchInvalidateRelatedWindows(); } /** * * rct2: 0x006848D4 */ -void research_finish_item(ResearchItem* researchItem) +void ResearchFinishItem(ResearchItem* researchItem) { gResearchLastItem = *researchItem; - research_invalidate_related_windows(); + ResearchInvalidateRelatedWindows(); if (researchItem->type == Research::EntryType::Ride) { @@ -212,8 +212,8 @@ void research_finish_item(ResearchItem* researchItem) } StringId availabilityString; - ride_type_set_invented(base_ride_type); - ride_entry_set_invented(rideEntryIndex); + RideTypeSetInvented(base_ride_type); + RideEntrySetInvented(rideEntryIndex); bool seenRideEntry[MAX_RIDE_OBJECTS]{}; for (auto const& researchItem3 : gResearchItemsUninvented) @@ -240,7 +240,7 @@ void research_finish_item(ResearchItem* researchItem) { if (rideEntry2->ride_type[j] == base_ride_type) { - ride_entry_set_invented(i); + RideEntrySetInvented(i); break; } } @@ -278,7 +278,7 @@ void research_finish_item(ResearchItem* researchItem) } } - research_invalidate_related_windows(); + ResearchInvalidateRelatedWindows(); } } else @@ -287,7 +287,7 @@ void research_finish_item(ResearchItem* researchItem) rct_scenery_group_entry* sceneryGroupEntry = GetSceneryGroupEntry(researchItem->entryIndex); if (sceneryGroupEntry != nullptr) { - scenery_group_set_invented(researchItem->entryIndex); + SceneryGroupSetInvented(researchItem->entryIndex); Formatter ft; ft.Add(sceneryGroupEntry->name); @@ -301,7 +301,7 @@ void research_finish_item(ResearchItem* researchItem) } } - research_invalidate_related_windows(); + ResearchInvalidateRelatedWindows(); SceneryInit(); } } @@ -311,7 +311,7 @@ void research_finish_item(ResearchItem* researchItem) * * rct2: 0x00684C7A */ -void research_update() +void ResearchUpdate() { PROFILED_FUNCTION(); @@ -348,22 +348,22 @@ void research_update() switch (gResearchProgressStage) { case RESEARCH_STAGE_INITIAL_RESEARCH: - research_next_design(); - research_calculate_expected_date(); + ResearchNextDesign(); + ResearchCalculateExpectedDate(); break; case RESEARCH_STAGE_DESIGNING: gResearchProgress = 0; gResearchProgressStage = RESEARCH_STAGE_COMPLETING_DESIGN; - research_calculate_expected_date(); - research_invalidate_related_windows(); + ResearchCalculateExpectedDate(); + ResearchInvalidateRelatedWindows(); break; case RESEARCH_STAGE_COMPLETING_DESIGN: - research_finish_item(&*gResearchNextItem); + ResearchFinishItem(&*gResearchNextItem); gResearchProgress = 0; gResearchProgressStage = RESEARCH_STAGE_INITIAL_RESEARCH; - research_calculate_expected_date(); + ResearchCalculateExpectedDate(); ResearchUpdateUncompletedTypes(); - research_invalidate_related_windows(); + ResearchInvalidateRelatedWindows(); break; case RESEARCH_STAGE_FINISHED_ALL: gResearchFundingLevel = RESEARCH_FUNDING_NONE; @@ -376,18 +376,18 @@ void research_update() * * rct2: 0x00684AC3 */ -void research_reset_current_item() +void ResearchResetCurrentItem() { - set_every_ride_type_not_invented(); - set_every_ride_entry_not_invented(); + SetEveryRideTypeNotInvented(); + SetEveryRideEntryNotInvented(); // The following two instructions together make all items not tied to a scenery group available. - set_all_scenery_items_invented(); - set_all_scenery_groups_not_invented(); + SetAllSceneryItemsInvented(); + SetAllSceneryGroupsNotInvented(); for (auto& researchItem : gResearchItemsInvented) { - research_finish_item(&researchItem); + ResearchFinishItem(&researchItem); } gResearchLastItem = std::nullopt; @@ -399,7 +399,7 @@ void research_reset_current_item() * * rct2: 0x006857FA */ -static void research_insert_unresearched(ResearchItem&& item) +static void ResearchInsertUnresearched(ResearchItem&& item) { // First check to make sure that entry is not already accounted for if (item.Exists()) @@ -414,7 +414,7 @@ static void research_insert_unresearched(ResearchItem&& item) * * rct2: 0x00685826 */ -static void research_insert_researched(ResearchItem&& item) +static void ResearchInsertResearched(ResearchItem&& item) { // First check to make sure that entry is not already accounted for if (item.Exists()) @@ -451,15 +451,15 @@ void ResearchRemove(const ResearchItem& researchItem) } } -void research_insert(ResearchItem&& item, bool researched) +void ResearchInsert(ResearchItem&& item, bool researched) { if (researched) { - research_insert_researched(std::move(item)); + ResearchInsertResearched(std::move(item)); } else { - research_insert_unresearched(std::move(item)); + ResearchInsertUnresearched(std::move(item)); } } @@ -467,9 +467,9 @@ void research_insert(ResearchItem&& item, bool researched) * * rct2: 0x00685675 */ -void research_populate_list_random() +void ResearchPopulateListRandom() { - research_reset_items(); + ResearchResetItems(); // Rides for (int32_t i = 0; i < MAX_RIDE_OBJECTS; i++) @@ -486,7 +486,7 @@ void research_populate_list_random() if (rideType != RIDE_TYPE_NULL) { ResearchCategory category = GetRideTypeDescriptor(rideType).GetResearchCategory(); - research_insert_ride_entry(rideType, i, category, researched); + ResearchInsertRideEntry(rideType, i, category, researched); } } } @@ -501,23 +501,23 @@ void research_populate_list_random() } int32_t researched = (ScenarioRand() & 0xFF) > 85; - research_insert_scenery_group_entry(i, researched); + ResearchInsertSceneryGroupEntry(i, researched); } } -bool research_insert_ride_entry(ride_type_t rideType, ObjectEntryIndex entryIndex, ResearchCategory category, bool researched) +bool ResearchInsertRideEntry(ride_type_t rideType, ObjectEntryIndex entryIndex, ResearchCategory category, bool researched) { if (rideType != RIDE_TYPE_NULL && entryIndex != OBJECT_ENTRY_INDEX_NULL) { auto tmpItem = ResearchItem(Research::EntryType::Ride, entryIndex, rideType, category, 0); - research_insert(std::move(tmpItem), researched); + ResearchInsert(std::move(tmpItem), researched); return true; } return false; } -void research_insert_ride_entry(ObjectEntryIndex entryIndex, bool researched) +void ResearchInsertRideEntry(ObjectEntryIndex entryIndex, bool researched) { rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); if (rideEntry == nullptr) @@ -528,28 +528,28 @@ void research_insert_ride_entry(ObjectEntryIndex entryIndex, bool researched) if (rideType != RIDE_TYPE_NULL) { ResearchCategory category = GetRideTypeDescriptor(rideType).GetResearchCategory(); - research_insert_ride_entry(rideType, entryIndex, category, researched); + ResearchInsertRideEntry(rideType, entryIndex, category, researched); } } } -bool research_insert_scenery_group_entry(ObjectEntryIndex entryIndex, bool researched) +bool ResearchInsertSceneryGroupEntry(ObjectEntryIndex entryIndex, bool researched) { if (entryIndex != OBJECT_ENTRY_INDEX_NULL) { auto tmpItem = ResearchItem(Research::EntryType::Scenery, entryIndex, 0, ResearchCategory::SceneryGroup, 0); - research_insert(std::move(tmpItem), researched); + ResearchInsert(std::move(tmpItem), researched); return true; } return false; } -bool ride_type_is_invented(uint32_t rideType) +bool RideTypeIsInvented(uint32_t rideType) { return RideTypeIsValid(rideType) ? _researchedRideTypes[rideType] : false; } -bool ride_entry_is_invented(ObjectEntryIndex rideEntryIndex) +bool RideEntryIsInvented(ObjectEntryIndex rideEntryIndex) { if (rideEntryIndex >= std::size(_researchedRideEntries)) return false; @@ -557,7 +557,7 @@ bool ride_entry_is_invented(ObjectEntryIndex rideEntryIndex) return _researchedRideEntries[rideEntryIndex]; } -void ride_type_set_invented(uint32_t rideType) +void RideTypeSetInvented(uint32_t rideType) { if (RideTypeIsValid(rideType)) { @@ -565,7 +565,7 @@ void ride_type_set_invented(uint32_t rideType) } } -void ride_entry_set_invented(ObjectEntryIndex rideEntryIndex) +void RideEntrySetInvented(ObjectEntryIndex rideEntryIndex) { if (rideEntryIndex >= std::size(_researchedRideEntries)) LOG_ERROR("Tried setting ride entry %u as invented", rideEntryIndex); @@ -573,7 +573,7 @@ void ride_entry_set_invented(ObjectEntryIndex rideEntryIndex) _researchedRideEntries[rideEntryIndex] = true; } -bool scenery_is_invented(const ScenerySelection& sceneryItem) +bool SceneryIsInvented(const ScenerySelection& sceneryItem) { if (sceneryItem.SceneryType < SCENERY_TYPE_COUNT) { @@ -584,7 +584,7 @@ bool scenery_is_invented(const ScenerySelection& sceneryItem) return false; } -void scenery_set_invented(const ScenerySelection& sceneryItem) +void ScenerySetInvented(const ScenerySelection& sceneryItem) { if (sceneryItem.SceneryType < SCENERY_TYPE_COUNT) { @@ -596,7 +596,7 @@ void scenery_set_invented(const ScenerySelection& sceneryItem) } } -void scenery_set_not_invented(const ScenerySelection& sceneryItem) +void ScenerySetNotInvented(const ScenerySelection& sceneryItem) { if (sceneryItem.SceneryType < SCENERY_TYPE_COUNT) { @@ -608,7 +608,7 @@ void scenery_set_not_invented(const ScenerySelection& sceneryItem) } } -bool scenery_group_is_invented(int32_t sgIndex) +bool SceneryGroupIsInvented(int32_t sgIndex) { const auto sgEntry = GetSceneryGroupEntry(sgIndex); if (sgEntry == nullptr || sgEntry->SceneryEntries.empty()) @@ -633,19 +633,19 @@ bool scenery_group_is_invented(int32_t sgIndex) }); } -void scenery_group_set_invented(int32_t sgIndex) +void SceneryGroupSetInvented(int32_t sgIndex) { const auto sgEntry = GetSceneryGroupEntry(sgIndex); if (sgEntry != nullptr) { for (const auto& entry : sgEntry->SceneryEntries) { - scenery_set_invented(entry); + ScenerySetInvented(entry); } } } -void set_all_scenery_groups_not_invented() +void SetAllSceneryGroupsNotInvented() { for (int32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; ++i) { @@ -657,12 +657,12 @@ void set_all_scenery_groups_not_invented() for (const auto& sceneryEntry : scenery_set->SceneryEntries) { - scenery_set_not_invented(sceneryEntry); + ScenerySetNotInvented(sceneryEntry); } } } -void set_all_scenery_items_invented() +void SetAllSceneryItemsInvented() { for (auto sceneryType = 0; sceneryType < SCENERY_TYPE_COUNT; sceneryType++) { @@ -670,7 +670,7 @@ void set_all_scenery_items_invented() } } -void set_all_scenery_items_not_invented() +void SetAllSceneryItemsNotInvented() { for (auto sceneryType = 0; sceneryType < SCENERY_TYPE_COUNT; sceneryType++) { @@ -678,22 +678,22 @@ void set_all_scenery_items_not_invented() } } -void set_every_ride_type_invented() +void SetEveryRideTypeInvented() { std::fill(std::begin(_researchedRideTypes), std::end(_researchedRideTypes), true); } -void set_every_ride_type_not_invented() +void SetEveryRideTypeNotInvented() { std::fill(std::begin(_researchedRideTypes), std::end(_researchedRideTypes), false); } -void set_every_ride_entry_invented() +void SetEveryRideEntryInvented() { std::fill(std::begin(_researchedRideEntries), std::end(_researchedRideEntries), true); } -void set_every_ride_entry_not_invented() +void SetEveryRideEntryNotInvented() { std::fill(std::begin(_researchedRideEntries), std::end(_researchedRideEntries), false); } @@ -730,7 +730,7 @@ StringId ResearchItem::GetName() const * Do not use the research list outside of the inventions list window with the flags * Clears flags like "always researched". */ -void research_remove_flags() +void ResearchRemoveFlags() { for (auto& researchItem : gResearchItemsUninvented) { @@ -757,19 +757,19 @@ static void ResearchRemoveNullItems(std::vector& items) items.erase(it, std::end(items)); } -static void research_mark_item_as_researched(const ResearchItem& item) +static void ResearchMarkItemAsResearched(const ResearchItem& item) { if (item.type == Research::EntryType::Ride) { const auto* rideEntry = GetRideEntryByIndex(item.entryIndex); if (rideEntry != nullptr) { - ride_entry_set_invented(item.entryIndex); + RideEntrySetInvented(item.entryIndex); for (auto rideType : rideEntry->ride_type) { if (rideType != RIDE_TYPE_NULL) { - ride_type_set_invented(rideType); + RideTypeSetInvented(rideType); } } } @@ -781,7 +781,7 @@ static void research_mark_item_as_researched(const ResearchItem& item) { for (const auto& sceneryEntry : sgEntry->SceneryEntries) { - scenery_set_invented(sceneryEntry); + ScenerySetInvented(sceneryEntry); } } } @@ -789,10 +789,10 @@ static void research_mark_item_as_researched(const ResearchItem& item) static void ResearchRebuildInventedTables() { - set_every_ride_type_not_invented(); - set_every_ride_entry_invented(); - set_every_ride_entry_not_invented(); - set_all_scenery_items_not_invented(); + SetEveryRideTypeNotInvented(); + SetEveryRideEntryInvented(); + SetEveryRideEntryNotInvented(); + SetAllSceneryItemsNotInvented(); for (const auto& item : gResearchItemsInvented) { // Ignore item, if the research of it is in progress @@ -804,7 +804,7 @@ static void ResearchRebuildInventedTables() } } - research_mark_item_as_researched(item); + ResearchMarkItemAsResearched(item); } MarkAllUnrestrictedSceneryAsInvented(); } @@ -816,7 +816,7 @@ static void ResearchAddAllMissingItems(bool isResearched) const auto* rideEntry = GetRideEntryByIndex(i); if (rideEntry != nullptr) { - research_insert_ride_entry(i, isResearched); + ResearchInsertRideEntry(i, isResearched); } } @@ -825,7 +825,7 @@ static void ResearchAddAllMissingItems(bool isResearched) const auto* groupEntry = GetSceneryGroupEntry(i); if (groupEntry != nullptr) { - research_insert_scenery_group_entry(i, isResearched); + ResearchInsertSceneryGroupEntry(i, isResearched); } } } @@ -845,7 +845,7 @@ void ResearchFix() ResearchUpdateUncompletedTypes(); } -void research_items_make_all_unresearched() +void ResearchItemsMakeAllUnresearched() { gResearchItemsUninvented.insert( gResearchItemsUninvented.end(), std::make_move_iterator(gResearchItemsInvented.begin()), @@ -853,7 +853,7 @@ void research_items_make_all_unresearched() gResearchItemsInvented.clear(); } -void research_items_make_all_researched() +void ResearchItemsMakeAllResearched() { gResearchItemsInvented.insert( gResearchItemsInvented.end(), std::make_move_iterator(gResearchItemsUninvented.begin()), @@ -865,7 +865,7 @@ void research_items_make_all_researched() * * rct2: 0x00685A93 */ -void research_items_shuffle() +void ResearchItemsShuffle() { std::shuffle(std::begin(gResearchItemsUninvented), std::end(gResearchItemsUninvented), std::default_random_engine{}); } @@ -949,7 +949,7 @@ bool ResearchItem::operator==(const ResearchItem& rhs) const static BitSet _seenRideType = {}; -static void research_update_first_of_type(ResearchItem* researchItem) +static void ResearchUpdateFirstOfType(ResearchItem* researchItem) { if (researchItem->IsNull()) return; @@ -976,7 +976,7 @@ static void research_update_first_of_type(ResearchItem* researchItem) researchItem->flags |= RESEARCH_ENTRY_FLAG_FIRST_OF_TYPE; } -static void research_mark_ride_type_as_seen(const ResearchItem& researchItem) +static void ResearchMarkRideTypeAsSeen(const ResearchItem& researchItem) { auto rideType = researchItem.baseRideType; if (rideType >= RIDE_TYPE_COUNT) @@ -985,7 +985,7 @@ static void research_mark_ride_type_as_seen(const ResearchItem& researchItem) _seenRideType[rideType] = true; } -void research_determine_first_of_type() +void ResearchDetermineFirstOfType() { _seenRideType.reset(); @@ -1011,18 +1011,18 @@ void research_determine_first_of_type() if (gResearchNextItem.has_value() && !gResearchNextItem->IsNull() && researchItem == gResearchNextItem.value()) continue; - research_mark_ride_type_as_seen(researchItem); + ResearchMarkRideTypeAsSeen(researchItem); } if (gResearchLastItem.has_value()) { - research_update_first_of_type(&gResearchLastItem.value()); - research_mark_ride_type_as_seen(gResearchLastItem.value()); + ResearchUpdateFirstOfType(&gResearchLastItem.value()); + ResearchMarkRideTypeAsSeen(gResearchLastItem.value()); } if (gResearchNextItem.has_value()) { - research_update_first_of_type(&gResearchNextItem.value()); - research_mark_ride_type_as_seen(gResearchNextItem.value()); + ResearchUpdateFirstOfType(&gResearchNextItem.value()); + ResearchMarkRideTypeAsSeen(gResearchNextItem.value()); } for (auto& researchItem : gResearchItemsUninvented) @@ -1036,7 +1036,7 @@ void research_determine_first_of_type() continue; } - research_update_first_of_type(&researchItem); - research_mark_ride_type_as_seen(researchItem); + ResearchUpdateFirstOfType(&researchItem); + ResearchMarkRideTypeAsSeen(researchItem); } } diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index aa43e597b5..a166202885 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -123,44 +123,44 @@ extern std::vector gResearchItemsInvented; extern uint8_t gResearchUncompletedCategories; extern bool gSilentResearch; -void research_reset_items(); +void ResearchResetItems(); void ResearchUpdateUncompletedTypes(); -void research_update(); -void research_reset_current_item(); -void research_populate_list_random(); +void ResearchUpdate(); +void ResearchResetCurrentItem(); +void ResearchPopulateListRandom(); -void research_finish_item(ResearchItem* researchItem); -void research_insert(ResearchItem&& item, bool researched); +void ResearchFinishItem(ResearchItem* researchItem); +void ResearchInsert(ResearchItem&& item, bool researched); void ResearchRemove(const ResearchItem& researchItem); -bool research_insert_ride_entry(ride_type_t rideType, ObjectEntryIndex entryIndex, ResearchCategory category, bool researched); -void research_insert_ride_entry(ObjectEntryIndex entryIndex, bool researched); -bool research_insert_scenery_group_entry(ObjectEntryIndex entryIndex, bool researched); +bool ResearchInsertRideEntry(ride_type_t rideType, ObjectEntryIndex entryIndex, ResearchCategory category, bool researched); +void ResearchInsertRideEntry(ObjectEntryIndex entryIndex, bool researched); +bool ResearchInsertSceneryGroupEntry(ObjectEntryIndex entryIndex, bool researched); -void ride_type_set_invented(uint32_t rideType); -void ride_entry_set_invented(ObjectEntryIndex rideEntryIndex); -void scenery_set_invented(const ScenerySelection& sceneryItem); -void scenery_set_not_invented(const ScenerySelection& sceneryItem); -bool ride_type_is_invented(uint32_t rideType); -bool ride_entry_is_invented(ObjectEntryIndex rideEntryIndex); -bool scenery_group_is_invented(int32_t sgIndex); -void scenery_group_set_invented(int32_t sgIndex); -bool scenery_is_invented(const ScenerySelection& sceneryItem); -void set_all_scenery_items_invented(); -void set_all_scenery_items_not_invented(); -void set_all_scenery_groups_not_invented(); -void set_every_ride_type_invented(); -void set_every_ride_type_not_invented(); -void set_every_ride_entry_invented(); -void set_every_ride_entry_not_invented(); -void research_remove_flags(); +void RideTypeSetInvented(uint32_t rideType); +void RideEntrySetInvented(ObjectEntryIndex rideEntryIndex); +void ScenerySetInvented(const ScenerySelection& sceneryItem); +void ScenerySetNotInvented(const ScenerySelection& sceneryItem); +bool RideTypeIsInvented(uint32_t rideType); +bool RideEntryIsInvented(ObjectEntryIndex rideEntryIndex); +bool SceneryGroupIsInvented(int32_t sgIndex); +void SceneryGroupSetInvented(int32_t sgIndex); +bool SceneryIsInvented(const ScenerySelection& sceneryItem); +void SetAllSceneryItemsInvented(); +void SetAllSceneryItemsNotInvented(); +void SetAllSceneryGroupsNotInvented(); +void SetEveryRideTypeInvented(); +void SetEveryRideTypeNotInvented(); +void SetEveryRideEntryInvented(); +void SetEveryRideEntryNotInvented(); +void ResearchRemoveFlags(); void ResearchFix(); -void research_items_make_all_unresearched(); -void research_items_make_all_researched(); -void research_items_shuffle(); +void ResearchItemsMakeAllUnresearched(); +void ResearchItemsMakeAllResearched(); +void ResearchItemsShuffle(); /** * Determines if a newly invented ride entry should be listed as a new ride * or as a new vehicle for a pre-existing ride. */ -void research_determine_first_of_type(); +void ResearchDetermineFirstOfType(); diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 984d8ea742..e03330eae4 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -2425,7 +2425,7 @@ public: void Import() override { _parkFile->Import(); - research_determine_first_of_type(); + ResearchDetermineFirstOfType(); GameFixSaveVars(); } diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 5f094b7d35..85034982b4 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -196,7 +196,7 @@ namespace RCT1 SetDefaultNames(); DetermineRideEntranceAndExitLocations(); - research_determine_first_of_type(); + ResearchDetermineFirstOfType(); CheatsReset(); ClearRestrictedScenery(); @@ -1867,7 +1867,7 @@ namespace RCT1 // All available objects must be loaded before this method is called as it // requires them to correctly insert objects into the research list - research_reset_items(); + ResearchResetItems(); size_t researchListCount; const RCT1::ResearchItem* researchList = GetResearchList(&researchListCount); @@ -1879,7 +1879,7 @@ namespace RCT1 // The first six scenery groups are always available for (uint8_t i = 0; i < 6; i++) { - research_insert_scenery_group_entry(i, true); + ResearchInsertSceneryGroupEntry(i, true); } bool researched = true; @@ -1911,7 +1911,7 @@ namespace RCT1 if (sceneryGroupEntryIndex != OBJECT_ENTRY_INDEX_IGNORE && sceneryGroupEntryIndex != OBJECT_ENTRY_INDEX_NULL) { - research_insert_scenery_group_entry(sceneryGroupEntryIndex, researched); + ResearchInsertSceneryGroupEntry(sceneryGroupEntryIndex, researched); } break; } @@ -1968,7 +1968,7 @@ namespace RCT1 if (!_researchRideEntryUsed[ownRideEntryIndex]) { _researchRideEntryUsed[ownRideEntryIndex] = true; - research_insert_ride_entry(ownRideEntryIndex, researched); + ResearchInsertRideEntry(ownRideEntryIndex, researched); } } @@ -2029,7 +2029,7 @@ namespace RCT1 // This will mark items as researched/unresearched according to the research list. // This needs to be called before importing progress, as it will reset it. - research_reset_current_item(); + ResearchResetCurrentItem(); // Research history gResearchProgress = _s4.research_progress; @@ -2099,7 +2099,7 @@ namespace RCT1 if (!_researchRideEntryUsed[rideEntryIndex]) { _researchRideEntryUsed[rideEntryIndex] = true; - research_insert_ride_entry(rideEntryIndex, researched); + ResearchInsertRideEntry(rideEntryIndex, researched); } } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index cbeef377ab..714f149e8b 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -508,7 +508,7 @@ namespace RCT2 FixLandOwnership(); FixAyersRockScenario(); - research_determine_first_of_type(); + ResearchDetermineFirstOfType(); UpdateConsolidatedPatrolAreas(); CheatsReset(); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 0d9296a76a..8237c66f2a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5352,7 +5352,7 @@ int32_t RideGetEntryIndex(int32_t rideType, int32_t rideSubType) } // Can happen in select-by-track-type mode - if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) + if (!RideEntryIsInvented(rideEntryIndex) && !gCheatsIgnoreResearchStatus) { continue; } diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 8e61cdd9ce..5a073c8445 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -2063,7 +2063,7 @@ static bool TrackDesignPlacePreview(TrackDesignState& tds, TrackDesign* td6, mon { *flags |= TRACK_DESIGN_FLAG_VEHICLE_UNAVAILABLE; } - else if (!ride_entry_is_invented(entry_index) && !gCheatsIgnoreResearchStatus) + else if (!RideEntryIsInvented(entry_index) && !gCheatsIgnoreResearchStatus) { *flags |= TRACK_DESIGN_FLAG_VEHICLE_UNAVAILABLE; } diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index d5ad1e2688..2a20892a5b 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -104,7 +104,7 @@ void ScenarioReset() Random::Rct2::Seed s{ 0x1234567F ^ Platform::GetTicks(), 0x789FABCD ^ Platform::GetTicks() }; gScenarioRand.seed(s); - research_reset_current_item(); + ResearchResetCurrentItem(); ScenerySetDefaultPlacementConfiguration(); News::InitQueue(); @@ -154,8 +154,8 @@ void ScenarioReset() gScenarioCompletedBy = "?"; park.ResetHistories(); - finance_reset_history(); - award_reset(); + FinanceResetHistory(); + AwardReset(); ResetAllRideBuildDates(); DateReset(); Duck::RemoveAll(); @@ -298,7 +298,7 @@ void ScenarioAutosaveCheck() static void ScenarioDayUpdate() { - finance_update_daily_profit(); + FinanceUpdateDailyProfit(); PeepUpdateDaysInQueue(); switch (gScenarioObjective.Type) { @@ -327,10 +327,10 @@ static void ScenarioWeekUpdate() { int32_t month = DateGetMonth(gDateMonthsElapsed); - finance_pay_wages(); - finance_pay_research(); - finance_pay_interest(); - marketing_update(); + FinancePayWages(); + FinancePayResearch(); + FinancePayInterest(); + MarketingUpdate(); PeepProblemWarningsUpdate(); RideCheckAllReachable(); RideUpdateFavouritedStat(); @@ -350,15 +350,15 @@ static void ScenarioWeekUpdate() static void ScenarioFortnightUpdate() { - finance_pay_ride_upkeep(); + FinancePayRideUpkeep(); } static void ScenarioMonthUpdate() { - finance_shift_expenditure_table(); + FinanceShiftExpenditureTable(); ScenarioCheckObjective(); ScenarioCheckEntranceFeeTooHigh(); - award_update_all(); + AwardUpdateAll(); } static void ScenarioUpdateDayNightCycle() diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 9e0b47ac1d..b823d04160 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -268,12 +268,12 @@ void Park::Initialise() gResearchLastItem = std::nullopt; gMarketingCampaigns.clear(); - research_reset_items(); - finance_init(); + ResearchResetItems(); + FinanceInit(); - set_every_ride_type_not_invented(); + SetEveryRideTypeNotInvented(); - set_all_scenery_items_invented(); + SetAllSceneryItemsInvented(); gParkEntranceFee = 10.00_GBP; @@ -296,8 +296,8 @@ void Park::Initialise() gConstructionRightsPrice = 40.00_GBP; gParkFlags = PARK_FLAGS_NO_MONEY | PARK_FLAGS_SHOW_REAL_GUEST_NAMES; ResetHistories(); - finance_reset_history(); - award_reset(); + FinanceResetHistory(); + AwardReset(); gScenarioName.clear(); gScenarioDetails = String::ToStd(LanguageGetString(STR_NO_DETAILS_YET)); @@ -511,7 +511,7 @@ money64 Park::CalculateCompanyValue() const auto result = gParkValue - gBankLoan; // Clamp addition to prevent overflow - result = add_clamp_money64(result, finance_get_current_cash()); + result = add_clamp_money64(result, FinanceGetCurrentCash()); return result; } @@ -631,7 +631,7 @@ uint32_t Park::CalculateGuestGenerationProbability() const for (const auto& award : GetAwards()) { // +/- 0.25% of the probability - if (award_is_positive(award.Type)) + if (AwardIsPositive(award.Type)) { probability += probability / 4; } @@ -682,7 +682,7 @@ void Park::GenerateGuests() for (const auto& campaign : gMarketingCampaigns) { // Random chance of guest generation - auto probability = marketing_get_campaign_guest_generation_probability(campaign.Type); + auto probability = MarketingGetCampaignGuestGenerationProbability(campaign.Type); auto random = ScenarioRandMax(std::numeric_limits::max()); if (random < probability) { @@ -696,7 +696,7 @@ Guest* Park::GenerateGuestFromCampaign(int32_t campaign) auto peep = GenerateGuest(); if (peep != nullptr) { - marketing_set_guest_campaign(peep, campaign); + MarketingSetGuestCampaign(peep, campaign); } return peep; } @@ -756,7 +756,7 @@ void Park::UpdateHistories() // Update park rating, guests in park and current cash history HistoryPushRecord(gParkRatingHistory, gParkRating / 4); HistoryPushRecord(gGuestsInParkHistory, gNumGuestsInPark); - HistoryPushRecord(gCashHistory, finance_get_current_cash() - gBankLoan); + HistoryPushRecord(gCashHistory, FinanceGetCurrentCash() - gBankLoan); // Update weekly profit history auto currentWeeklyProfit = gWeeklyProfitAverageDividend; diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 3a21cf39ab..02ce6d8dd3 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -358,7 +358,7 @@ bool IsSceneryAvailableToBuild(const ScenerySelection& item) if (!gCheatsIgnoreResearchStatus) { - if (!scenery_is_invented(item)) + if (!SceneryIsInvented(item)) { return false; } @@ -472,7 +472,7 @@ void MarkAllUnrestrictedSceneryAsInvented() { if (std::find(_restrictedScenery.begin(), _restrictedScenery.end(), sceneryItem) == _restrictedScenery.end()) { - scenery_set_invented(sceneryItem); + ScenerySetInvented(sceneryItem); } } }