From 9c810d9e32c536f87bded8a4b50683a03979179f Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 21 Aug 2025 20:50:23 +0200 Subject: [PATCH] Update ParkData fields to new code style --- src/openrct2-ui/input/Shortcuts.cpp | 2 +- src/openrct2-ui/interface/FileBrowser.cpp | 14 ++-- .../interface/ViewportInteraction.cpp | 2 +- src/openrct2-ui/windows/Cheats.cpp | 6 +- src/openrct2-ui/windows/ClearScenery.cpp | 2 +- .../windows/DemolishRidePrompt.cpp | 2 +- .../windows/EditorBottomToolbar.cpp | 2 +- .../windows/EditorScenarioOptions.cpp | 72 +++++++++--------- src/openrct2-ui/windows/Finances.cpp | 12 +-- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 12 +-- src/openrct2-ui/windows/Guest.cpp | 4 +- src/openrct2-ui/windows/GuestList.cpp | 2 +- src/openrct2-ui/windows/Land.cpp | 2 +- src/openrct2-ui/windows/LandRights.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 4 +- src/openrct2-ui/windows/Park.cpp | 28 +++---- .../windows/RefurbishRidePrompt.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 4 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/RideList.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2-ui/windows/Water.cpp | 2 +- src/openrct2/Editor.cpp | 16 ++-- src/openrct2/actions/CheatSetAction.cpp | 4 +- src/openrct2/actions/LandSetHeightAction.cpp | 4 +- .../actions/LargeSceneryRemoveAction.cpp | 2 +- .../actions/ParkEntrancePlaceAction.cpp | 4 +- .../actions/ParkEntranceRemoveAction.cpp | 4 +- src/openrct2/actions/ParkMarketingAction.cpp | 2 +- .../actions/ParkSetEntranceFeeAction.cpp | 4 +- src/openrct2/actions/ParkSetNameAction.cpp | 4 +- .../actions/ParkSetParameterAction.cpp | 8 +- src/openrct2/actions/RideCreateAction.cpp | 4 +- src/openrct2/actions/RideDemolishAction.cpp | 2 +- .../actions/ScenarioSetSettingAction.cpp | 76 +++++++++---------- .../actions/SmallSceneryRemoveAction.cpp | 2 +- src/openrct2/actions/StaffHireNewAction.cpp | 6 +- .../actions/SurfaceSetStyleAction.cpp | 2 +- src/openrct2/actions/WaterSetHeightAction.cpp | 2 +- src/openrct2/entity/Guest.cpp | 38 +++++----- src/openrct2/entity/Peep.cpp | 26 +++---- src/openrct2/interface/InteractiveConsole.cpp | 28 +++---- src/openrct2/interface/Screenshot.cpp | 2 +- src/openrct2/management/Award.cpp | 8 +- src/openrct2/management/Finance.cpp | 18 ++--- src/openrct2/management/Research.cpp | 2 +- src/openrct2/network/DiscordService.cpp | 2 +- .../network/NetworkServerAdvertiser.cpp | 4 +- .../paint/tile_element/Paint.Entrance.cpp | 4 +- src/openrct2/park/ParkFile.cpp | 30 ++++---- src/openrct2/park/ParkPreview.cpp | 10 +-- src/openrct2/peep/GuestPathfinding.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 32 ++++---- src/openrct2/rct2/S6Importer.cpp | 26 +++---- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 6 +- src/openrct2/ride/Vehicle.cpp | 4 +- src/openrct2/scenario/Scenario.cpp | 48 ++++++------ .../scripting/bindings/world/ScPark.cpp | 36 ++++----- src/openrct2/world/ConstructionClearance.cpp | 6 +- src/openrct2/world/Entrance.cpp | 14 ++-- src/openrct2/world/Map.cpp | 2 +- src/openrct2/world/Park.cpp | 64 ++++++++-------- src/openrct2/world/ParkData.h | 20 ++--- test/tests/PlayTests.cpp | 4 +- 71 files changed, 389 insertions(+), 389 deletions(-) diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 96e1c3992b..5a8fee1d22 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -268,7 +268,7 @@ static void ShortcutShowFinancialInformation() return; if (!(isInTrackDesignerOrManager())) - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) ContextOpenWindow(WindowClass::Finances); } diff --git a/src/openrct2-ui/interface/FileBrowser.cpp b/src/openrct2-ui/interface/FileBrowser.cpp index 3d6220d3b0..6f735c0779 100644 --- a/src/openrct2-ui/interface/FileBrowser.cpp +++ b/src/openrct2-ui/interface/FileBrowser.cpp @@ -275,12 +275,12 @@ namespace OpenRCT2::Ui::FileBrowser case (LoadSaveType::scenario): { SetAndSaveConfigPath(Config::Get().general.LastSaveScenarioDirectory, pathBuffer); - int32_t parkFlagsBackup = gameState.park.Flags; - gameState.park.Flags &= ~PARK_FLAGS_SPRITES_INITIALISED; + int32_t parkFlagsBackup = gameState.park.flags; + gameState.park.flags &= ~PARK_FLAGS_SPRITES_INITIALISED; gameState.editorStep = EditorStep::Invalid; gameState.scenarioFileName = std::string(String::toStringView(pathBuffer, std::size(pathBuffer))); int32_t success = ScenarioSave(gameState, pathBuffer, Config::Get().general.SavePluginData ? 3 : 2); - gameState.park.Flags = parkFlagsBackup; + gameState.park.flags = parkFlagsBackup; if (success) { @@ -364,12 +364,12 @@ namespace OpenRCT2::Ui::FileBrowser case LoadSaveType::scenario: { SetAndSaveConfigPath(Config::Get().general.LastSaveScenarioDirectory, pathBuffer); - int32_t parkFlagsBackup = gameState.park.Flags; - gameState.park.Flags &= ~PARK_FLAGS_SPRITES_INITIALISED; + int32_t parkFlagsBackup = gameState.park.flags; + gameState.park.flags &= ~PARK_FLAGS_SPRITES_INITIALISED; gameState.editorStep = EditorStep::Invalid; gameState.scenarioFileName = std::string(String::toStringView(pathBuffer, std::size(pathBuffer))); int32_t success = ScenarioSave(gameState, pathBuffer, Config::Get().general.SavePluginData ? 3 : 2); - gameState.park.Flags = parkFlagsBackup; + gameState.park.flags = parkFlagsBackup; if (success) { @@ -503,7 +503,7 @@ namespace OpenRCT2::Ui::FileBrowser } else { - auto buffer = getGameState().park.Name; + auto buffer = getGameState().park.name; if (buffer.empty()) { buffer = LanguageGetString(STR_UNNAMED_PARK); diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index ec3c8bd7cc..19fee88198 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -147,7 +147,7 @@ namespace OpenRCT2::Ui case ViewportInteractionItem::ParkEntrance: { auto& gameState = getGameState(); - auto parkName = gameState.park.Name.c_str(); + auto parkName = gameState.park.name.c_str(); auto ft = Formatter(); ft.Add(STR_STRING); diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 906446cdbd..aa3ef5ab2c 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -517,7 +517,7 @@ static StringId window_cheats_page_titles[] = { SetWidgetDisabled(WIDX_NO_MONEY, true); } - auto moneyDisabled = (gameState.park.Flags & PARK_FLAGS_NO_MONEY) != 0; + auto moneyDisabled = (gameState.park.flags & PARK_FLAGS_NO_MONEY) != 0; SetCheckboxValue(WIDX_NO_MONEY, moneyDisabled); SetWidgetDisabled(WIDX_ADD_SET_MONEY_GROUP, moneyDisabled); SetWidgetDisabled(WIDX_MONEY_SPINNER, moneyDisabled); @@ -540,7 +540,7 @@ static StringId window_cheats_page_titles[] = { } case WINDOW_CHEATS_PAGE_PARK: widgets[WIDX_OPEN_CLOSE_PARK].text = STR_CHEAT_OPEN_PARK; - if (gameState.park.Flags & PARK_FLAGS_PARK_OPEN) + if (gameState.park.flags & PARK_FLAGS_PARK_OPEN) widgets[WIDX_OPEN_CLOSE_PARK].text = STR_CHEAT_CLOSE_PARK; SetCheckboxValue(WIDX_FORCE_PARK_RATING, Park::GetForcedRating() >= 0); @@ -939,7 +939,7 @@ static StringId window_cheats_page_titles[] = { switch (widgetIndex) { case WIDX_NO_MONEY: - CheatsSet(CheatType::NoMoney, getGameState().park.Flags & PARK_FLAGS_NO_MONEY ? 0 : 1); + CheatsSet(CheatType::NoMoney, getGameState().park.flags & PARK_FLAGS_NO_MONEY ? 0 : 1); break; case WIDX_MONEY_SPINNER: MoneyToString(_moneySpinnerValue, _moneySpinnerText, kMoneyStringMaxlength, false); diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 704e585abd..e22618f5b3 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -187,7 +187,7 @@ namespace OpenRCT2::Ui::Windows // Draw cost amount if (_clearSceneryCost != kMoney64Undefined && _clearSceneryCost != 0 - && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(_clearSceneryCost); diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 0ad35502cc..20f3c47afb 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -80,7 +80,7 @@ namespace OpenRCT2::Ui::Windows auto currentRide = GetRide(rideId); if (currentRide != nullptr) { - auto stringId = (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) ? STR_DEMOLISH_RIDE_ID + auto stringId = (getGameState().park.flags & PARK_FLAGS_NO_MONEY) ? STR_DEMOLISH_RIDE_ID : STR_DEMOLISH_RIDE_ID_MONEY; auto ft = Formatter(); currentRide->formatNameTo(ft); diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index f9f1c5c7e9..2fc5711cd5 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -78,7 +78,7 @@ namespace OpenRCT2::Ui::Windows bool GameHasEntities() const { - return GetNumFreeEntities() != kMaxEntities || getGameState().park.Flags & PARK_FLAGS_SPRITES_INITIALISED; + return GetNumFreeEntities() != kMaxEntities || getGameState().park.flags & PARK_FLAGS_SPRITES_INITIALISED; } void OnPrepareDraw() override diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 58eb52d345..4dde67d849 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -736,7 +736,7 @@ namespace OpenRCT2::Ui::Windows if (i == OBJECTIVE_NONE || i == OBJECTIVE_BUILD_THE_BEST) continue; - const bool objectiveAllowedByMoneyUsage = !(gameState.park.Flags & PARK_FLAGS_NO_MONEY) + const bool objectiveAllowedByMoneyUsage = !(gameState.park.flags & PARK_FLAGS_NO_MONEY) || !ObjectiveNeedsMoney(i); // This objective can only work if the player can ask money for rides. const bool objectiveAllowedByPaymentSettings = (i != OBJECTIVE_MONTHLY_RIDE_INCOME) @@ -958,7 +958,7 @@ namespace OpenRCT2::Ui::Windows auto& gameState = getGameState(); auto scenarioSetSetting = ScenarioSetSettingAction( ScenarioSetSetting::ParkRatingHigherDifficultyLevel, - gameState.park.Flags & PARK_FLAGS_DIFFICULT_PARK_RATING ? 0 : 1); + gameState.park.flags & PARK_FLAGS_DIFFICULT_PARK_RATING ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -1030,7 +1030,7 @@ namespace OpenRCT2::Ui::Windows objectiveType = getGameState().scenarioObjective.Type; // Check if objective is allowed by money and pay-per-ride settings. - const bool objectiveAllowedByMoneyUsage = !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + const bool objectiveAllowedByMoneyUsage = !(getGameState().park.flags & PARK_FLAGS_NO_MONEY) || !ObjectiveNeedsMoney(objectiveType); // This objective can only work if the player can ask money for rides. const bool objectiveAllowedByPaymentSettings = (objectiveType != OBJECTIVE_MONTHLY_RIDE_INCOME) @@ -1125,7 +1125,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; - SetWidgetPressed(WIDX_HARD_PARK_RATING, gameState.park.Flags & PARK_FLAGS_DIFFICULT_PARK_RATING); + SetWidgetPressed(WIDX_HARD_PARK_RATING, gameState.park.flags & PARK_FLAGS_DIFFICULT_PARK_RATING); } /** @@ -1211,7 +1211,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_PARK_NAME: { WindowTextInputRawOpen( - this, WIDX_PARK_NAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, gameState.park.Name.c_str(), + this, WIDX_PARK_NAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, gameState.park.name.c_str(), kParkNameMaxLength); break; } @@ -1274,7 +1274,7 @@ namespace OpenRCT2::Ui::Windows int32_t widthToSet = widgets[WIDX_PARK_NAME].left - 16; { - auto parkName = gameState.park.Name.c_str(); + auto parkName = gameState.park.name.c_str(); auto ft = Formatter(); ft.Add(STR_STRING); @@ -1334,7 +1334,7 @@ namespace OpenRCT2::Ui::Windows if (gameState.scenarioName.empty()) { - gameState.scenarioName = gameState.park.Name; + gameState.scenarioName = gameState.park.name; } break; } @@ -1371,7 +1371,7 @@ namespace OpenRCT2::Ui::Windows { case WIDX_NO_MONEY: { - auto newMoneySetting = (gameState.park.Flags & PARK_FLAGS_NO_MONEY) ? 0 : 1; + auto newMoneySetting = (gameState.park.flags & PARK_FLAGS_NO_MONEY) ? 0 : 1; auto scenarioSetSetting = ScenarioSetSettingAction(ScenarioSetSetting::NoMoney, newMoneySetting); GameActions::Execute(&scenarioSetSetting); Invalidate(); @@ -1381,7 +1381,7 @@ namespace OpenRCT2::Ui::Windows { auto scenarioSetSetting = ScenarioSetSettingAction( ScenarioSetSetting::ForbidMarketingCampaigns, - gameState.park.Flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN ? 0 : 1); + gameState.park.flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -1389,7 +1389,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_RCT1_INTEREST: { auto scenarioSetSetting = ScenarioSetSettingAction( - ScenarioSetSetting::UseRCT1Interest, gameState.park.Flags & PARK_FLAGS_RCT1_INTEREST ? 0 : 1); + ScenarioSetSetting::UseRCT1Interest, gameState.park.flags & PARK_FLAGS_RCT1_INTEREST ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -1512,10 +1512,10 @@ namespace OpenRCT2::Ui::Windows Invalidate(); break; case WIDX_ENTRY_PRICE_INCREASE: - if (gameState.park.EntranceFee < kMaxEntranceFee) + if (gameState.park.entranceFee < kMaxEntranceFee) { auto scenarioSetSetting = ScenarioSetSettingAction( - ScenarioSetSetting::ParkChargeEntryFee, gameState.park.EntranceFee + 1.00_GBP); + ScenarioSetSetting::ParkChargeEntryFee, gameState.park.entranceFee + 1.00_GBP); GameActions::Execute(&scenarioSetSetting); } else @@ -1525,10 +1525,10 @@ namespace OpenRCT2::Ui::Windows Invalidate(); break; case WIDX_ENTRY_PRICE_DECREASE: - if (gameState.park.EntranceFee > 0.00_GBP) + if (gameState.park.entranceFee > 0.00_GBP) { auto scenarioSetSetting = ScenarioSetSettingAction( - ScenarioSetSetting::ParkChargeEntryFee, gameState.park.EntranceFee - 1.00_GBP); + ScenarioSetSetting::ParkChargeEntryFee, gameState.park.entranceFee - 1.00_GBP); GameActions::Execute(&scenarioSetSetting); } else @@ -1552,9 +1552,9 @@ namespace OpenRCT2::Ui::Windows { windowPos.x + dropdownWidget->left, windowPos.y + dropdownWidget->top }, dropdownWidget->height() - 1, colours[1], 0, Dropdown::Flag::StayOpen, 3, dropdownWidget->width() - 3); - if (gameState.park.Flags & PARK_FLAGS_UNLOCK_ALL_PRICES) + if (gameState.park.flags & PARK_FLAGS_UNLOCK_ALL_PRICES) Dropdown::SetChecked(2, true); - else if (gameState.park.Flags & PARK_FLAGS_PARK_FREE_ENTRY) + else if (gameState.park.flags & PARK_FLAGS_PARK_FREE_ENTRY) Dropdown::SetChecked(0, true); else Dropdown::SetChecked(1, true); @@ -1601,7 +1601,7 @@ namespace OpenRCT2::Ui::Windows SetPressedTab(); auto& gameState = getGameState(); - bool noMoney = gameState.park.Flags & PARK_FLAGS_NO_MONEY; + bool noMoney = gameState.park.flags & PARK_FLAGS_NO_MONEY; SetWidgetPressed(WIDX_NO_MONEY, noMoney); SetWidgetDisabled(WIDX_GROUP_LOAN, noMoney); @@ -1614,7 +1614,7 @@ namespace OpenRCT2::Ui::Windows SetWidgetDisabled(WIDX_MAXIMUM_LOAN_INCREASE, noMoney); SetWidgetDisabled(WIDX_MAXIMUM_LOAN_DECREASE, noMoney); - if (gameState.park.Flags & PARK_FLAGS_RCT1_INTEREST) + if (gameState.park.flags & PARK_FLAGS_RCT1_INTEREST) { widgets[WIDX_INTEREST_RATE_LABEL].type = WidgetType::empty; widgets[WIDX_INTEREST_RATE].type = WidgetType::empty; @@ -1666,7 +1666,7 @@ namespace OpenRCT2::Ui::Windows SetWidgetDisabled(WIDX_ENTRY_PRICE_DECREASE, noMoney); } - SetWidgetPressed(WIDX_FORBID_MARKETING, gameState.park.Flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN); + SetWidgetPressed(WIDX_FORBID_MARKETING, gameState.park.flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN); widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; } @@ -1731,9 +1731,9 @@ namespace OpenRCT2::Ui::Windows auto ft = Formatter(); // Pay for park and/or rides value - if (gameState.park.Flags & PARK_FLAGS_UNLOCK_ALL_PRICES) + if (gameState.park.flags & PARK_FLAGS_UNLOCK_ALL_PRICES) ft.Add(STR_PAID_ENTRY_PAID_RIDES); - else if (gameState.park.Flags & PARK_FLAGS_PARK_FREE_ENTRY) + else if (gameState.park.flags & PARK_FLAGS_PARK_FREE_ENTRY) ft.Add(STR_FREE_PARK_ENTER); else ft.Add(STR_PAY_PARK_ENTER); @@ -1749,7 +1749,7 @@ namespace OpenRCT2::Ui::Windows // Entry price value screenCoords = windowPos + ScreenCoordsXY{ entryPriceWidget.left + 1, entryPriceWidget.top }; auto ft = Formatter(); - ft.Add(gameState.park.EntranceFee); + ft.Add(gameState.park.entranceFee); auto colour = !IsWidgetDisabled(WIDX_INITIAL_CASH) ? wColour2 : wColour2.withFlag(ColourFlag::inset, true); DrawTextBasic(rt, screenCoords, STR_CURRENCY_FORMAT_LABEL, ft, colour); } @@ -1893,8 +1893,8 @@ namespace OpenRCT2::Ui::Windows { windowPos.x + dropdownWidget.left, windowPos.y + dropdownWidget.top }, dropdownWidget.height() - 1, colours[1], 0, Dropdown::Flag::StayOpen, 4, dropdownWidget.width() - 3); - const auto preferLess = gameState.park.Flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES; - const auto preferMore = gameState.park.Flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + const auto preferLess = gameState.park.flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + const auto preferMore = gameState.park.flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES; auto prefItem = 1; if (preferLess && preferMore) @@ -1911,7 +1911,7 @@ namespace OpenRCT2::Ui::Windows { auto scenarioSetSetting = ScenarioSetSettingAction( ScenarioSetSetting::GuestGenerationHigherDifficultyLevel, - gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION ? 0 : 1); + gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -1947,7 +1947,7 @@ namespace OpenRCT2::Ui::Windows SetPressedTab(); auto& gameState = getGameState(); - bool noMoney = gameState.park.Flags & PARK_FLAGS_NO_MONEY; + bool noMoney = gameState.park.flags & PARK_FLAGS_NO_MONEY; SetWidgetDisabled(WIDX_CASH_PER_GUEST_LABEL, noMoney); SetWidgetDisabled(WIDX_CASH_PER_GUEST, noMoney); @@ -1956,7 +1956,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; - SetWidgetPressed(WIDX_HARD_GUEST_GENERATION, gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION); + SetWidgetPressed(WIDX_HARD_GUEST_GENERATION, gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION); } void GuestsDraw(RenderTarget& rt) @@ -2008,8 +2008,8 @@ namespace OpenRCT2::Ui::Windows const auto& guestsIntensity = widgets[WIDX_GUESTS_INTENSITY_PREFERENCE]; screenCoords = windowPos + ScreenCoordsXY{ guestsIntensity.left + 1, guestsIntensity.top }; - const auto preferLess = gameState.park.Flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES; - const auto preferMore = gameState.park.Flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + const auto preferLess = gameState.park.flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + const auto preferMore = gameState.park.flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES; StringId prefString = STR_GUESTS_PREFER_INTENSITY_BALANCED; if (preferLess && preferMore) @@ -2037,7 +2037,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_FORBID_TREE_REMOVAL: { auto scenarioSetSetting = ScenarioSetSettingAction( - ScenarioSetSetting::ForbidTreeRemoval, gameState.park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL ? 0 : 1); + ScenarioSetSetting::ForbidTreeRemoval, gameState.park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -2046,7 +2046,7 @@ namespace OpenRCT2::Ui::Windows { auto scenarioSetSetting = ScenarioSetSettingAction( ScenarioSetSetting::ForbidLandscapeChanges, - gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES ? 0 : 1); + gameState.park.flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -2055,7 +2055,7 @@ namespace OpenRCT2::Ui::Windows { auto scenarioSetSetting = ScenarioSetSettingAction( ScenarioSetSetting::ForbidHighConstruction, - gameState.park.Flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION ? 0 : 1); + gameState.park.flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION ? 0 : 1); GameActions::Execute(&scenarioSetSetting); Invalidate(); break; @@ -2139,7 +2139,7 @@ namespace OpenRCT2::Ui::Windows SetPressedTab(); auto& gameState = getGameState(); - bool noMoney = gameState.park.Flags & PARK_FLAGS_NO_MONEY; + bool noMoney = gameState.park.flags & PARK_FLAGS_NO_MONEY; SetWidgetDisabled(WIDX_LAND_COST_LABEL, noMoney); SetWidgetDisabled(WIDX_LAND_COST, noMoney); @@ -2150,9 +2150,9 @@ namespace OpenRCT2::Ui::Windows SetWidgetDisabled(WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE, noMoney); SetWidgetDisabled(WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE, noMoney); - SetWidgetPressed(WIDX_FORBID_TREE_REMOVAL, gameState.park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL); - SetWidgetPressed(WIDX_FORBID_LANDSCAPE_CHANGES, gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES); - SetWidgetPressed(WIDX_FORBID_HIGH_CONSTRUCTION, gameState.park.Flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION); + SetWidgetPressed(WIDX_FORBID_TREE_REMOVAL, gameState.park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL); + SetWidgetPressed(WIDX_FORBID_LANDSCAPE_CHANGES, gameState.park.flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES); + SetWidgetPressed(WIDX_FORBID_HIGH_CONSTRUCTION, gameState.park.flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION); widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; } diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index c15d9c5e34..8cabfc6f8d 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -226,7 +226,7 @@ namespace OpenRCT2::Ui::Windows void SetDisabledTabs() { - disabled_widgets = (getGameState().park.Flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) ? (1uLL << WIDX_TAB_5) : 0; + disabled_widgets = (getGameState().park.flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) ? (1uLL << WIDX_TAB_5) : 0; } public: @@ -326,7 +326,7 @@ namespace OpenRCT2::Ui::Windows case WINDOW_FINANCES_PAGE_VALUE_GRAPH: graphPageWidget = &widgets[WIDX_PAGE_BACKGROUND]; centredGraph = false; - _graphProps.series = getGameState().park.ValueHistory; + _graphProps.series = getGameState().park.valueHistory; break; case WINDOW_FINANCES_PAGE_PROFIT_GRAPH: graphPageWidget = &widgets[WIDX_PAGE_BACKGROUND]; @@ -364,7 +364,7 @@ namespace OpenRCT2::Ui::Windows break; } case WINDOW_FINANCES_PAGE_VALUE_GRAPH: - OnDrawGraph(rt, getGameState().park.Value, STR_FINANCES_PARK_VALUE); + OnDrawGraph(rt, getGameState().park.value, STR_FINANCES_PARK_VALUE); break; case WINDOW_FINANCES_PAGE_PROFIT_GRAPH: { @@ -621,7 +621,7 @@ namespace OpenRCT2::Ui::Windows // Loan and interest rate DrawTextBasic(rt, windowPos + ScreenCoordsXY{ 8, titleBarBottom + 265 }, STR_FINANCES_SUMMARY_LOAN); - if (!(gameState.park.Flags & PARK_FLAGS_RCT1_INTEREST)) + if (!(gameState.park.flags & PARK_FLAGS_RCT1_INTEREST)) { auto ft = Formatter(); ft.Add(gameState.park.bankLoanInterestRate); @@ -649,7 +649,7 @@ namespace OpenRCT2::Ui::Windows { // Park value and company value ft = Formatter(); - ft.Add(gameState.park.Value); + ft.Add(gameState.park.value); DrawTextBasic(rt, windowPos + ScreenCoordsXY{ 280, titleBarBottom + 265 }, STR_PARK_VALUE_LABEL, ft); ft = Formatter(); ft.Add(gameState.park.companyValue); @@ -739,7 +739,7 @@ namespace OpenRCT2::Ui::Windows break; default: { - auto parkName = getGameState().park.Name.c_str(); + auto parkName = getGameState().park.name.c_str(); ft.Add(STR_STRING); ft.Add(parkName); } diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 3d35de07d6..76f6346a1d 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -529,7 +529,7 @@ namespace OpenRCT2::Ui::Windows + ScreenCoordsXY{ widgets[WIDX_CONSTRUCT].midX(), widgets[WIDX_CONSTRUCT].bottom - 12 }; if (_windowFootpathCost != kMoney64Undefined) { - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(_windowFootpathCost); diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 7a0bee718e..aa830a4c52 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -100,7 +100,7 @@ namespace OpenRCT2::Ui::Windows auto& gameState = getGameState(); // Draw money - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { const auto& widget = widgets[WIDX_MONEY]; auto screenCoords = ScreenCoordsXY{ windowPos.x + widget.midX(), @@ -144,7 +144,7 @@ namespace OpenRCT2::Ui::Windows const auto& widget = widgets[WIDX_PARK_RATING]; auto screenCoords = windowPos + ScreenCoordsXY{ widget.left + 11, widget.midY() - 5 }; - DrawParkRating(rt, colours[3].colour, screenCoords, std::max(10, ((gameState.park.Rating / 4) * 263) / 256)); + DrawParkRating(rt, colours[3].colour, screenCoords, std::max(10, ((gameState.park.rating / 4) * 263) / 256)); } } @@ -432,7 +432,7 @@ namespace OpenRCT2::Ui::Windows { case WIDX_LEFT_OUTSET: case WIDX_MONEY: - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) ContextOpenWindow(WindowClass::Finances); break; case WIDX_GUESTS: @@ -488,10 +488,10 @@ namespace OpenRCT2::Ui::Windows { case WIDX_MONEY: ft.Add(gameState.park.currentProfit); - ft.Add(gameState.park.Value); + ft.Add(gameState.park.value); break; case WIDX_PARK_RATING: - ft.Add(gameState.park.Rating); + ft.Add(gameState.park.rating); break; } return { fallback, ft }; @@ -514,7 +514,7 @@ namespace OpenRCT2::Ui::Windows + 1; // Reposition left widgets in accordance with line height... depending on whether there is money in play. - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) { widgets[WIDX_MONEY].type = WidgetType::empty; widgets[WIDX_GUESTS].top = 1; diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index d3b48c1ae2..77faea9a16 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -489,7 +489,7 @@ namespace OpenRCT2::Ui::Windows if (!widgetIsDisabled(*this, WIDX_PICKUP)) Invalidate(); } - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) { newDisabledWidgets |= (1uLL << WIDX_TAB_4); // Disable finance tab if no money } @@ -1618,7 +1618,7 @@ namespace OpenRCT2::Ui::Windows std::pair InventoryFormatItem(Guest& guest, ShopItem item) const { - auto parkName = getGameState().park.Name.c_str(); + auto parkName = getGameState().park.name.c_str(); // Default item image auto& itemDesc = GetShopItemDescriptor(item); diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 3ad9188c5f..e632e61805 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -943,7 +943,7 @@ namespace OpenRCT2::Ui::Windows static GuestItem::CompareFunc GetGuestCompareFunc() { - return getGameState().park.Flags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES ? CompareGuestItem + return getGameState().park.flags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES ? CompareGuestItem : CompareGuestItem; } }; diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 4da094026a..5af49dc90f 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -280,7 +280,7 @@ namespace OpenRCT2::Ui::Windows screenCoords = { windowPos.x + previewWidget->midX(), windowPos.y + previewWidget->bottom + 5 }; - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { // Draw raise cost amount if (_landToolRaiseCost != kMoney64Undefined && _landToolRaiseCost != 0) diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index df5ba8a899..7359cf747d 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -408,7 +408,7 @@ namespace OpenRCT2::Ui::Windows // Draw cost amount if (_landRightsCost != kMoney64Undefined && _landRightsCost != 0 - && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(_landRightsCost); diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 657ec4689d..68db068898 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -849,7 +849,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP].type = WidgetType::groupbox; widgets[WIDX_LAST_DEVELOPMENT_GROUP].type = WidgetType::groupbox; widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WidgetType::flatBtn; - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) widgets[WIDX_RESEARCH_FUNDING_BUTTON].type = WidgetType::flatBtn; newWidth = 300; @@ -956,7 +956,7 @@ namespace OpenRCT2::Ui::Windows DrawTextBasic(rt, screenPos + ScreenCoordsXY{ 0, 51 }, designCountStringId, ft); // Price - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { // Get price of ride auto startPieceId = GetRideTypeDescriptor(item.Type).StartTrackPiece; diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 0e81980639..f98f8c988f 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -393,12 +393,12 @@ namespace OpenRCT2::Ui::Windows void SetDisabledTabs() { // Disable price tab if money is disabled - disabled_widgets = (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) ? (1uLL << WIDX_TAB_4) : 0; + disabled_widgets = (getGameState().park.flags & PARK_FLAGS_NO_MONEY) ? (1uLL << WIDX_TAB_4) : 0; } void PrepareWindowTitleText() { - auto parkName = getGameState().park.Name.c_str(); + auto parkName = getGameState().park.name.c_str(); auto ft = Formatter::Common(); ft.Add(STR_STRING); @@ -420,7 +420,7 @@ namespace OpenRCT2::Ui::Windows { auto& park = getGameState().park; WindowTextInputRawOpen( - this, WIDX_RENAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, park.Name.c_str(), kUserStringMaxLength); + this, WIDX_RENAME, STR_PARK_NAME, STR_ENTER_PARK_NAME, {}, park.name.c_str(), kUserStringMaxLength); break; } case WIDX_CLOSE_LIGHT: @@ -506,7 +506,7 @@ namespace OpenRCT2::Ui::Windows // Set open / close park button state { - auto parkName = gameState.park.Name.c_str(); + auto parkName = gameState.park.name.c_str(); auto ft = Formatter::Common(); ft.Add(STR_STRING); @@ -527,7 +527,7 @@ namespace OpenRCT2::Ui::Windows disabled_widgets &= ~((1uLL << WIDX_OPEN_OR_CLOSE) | (1uLL << WIDX_CLOSE_LIGHT) | (1uLL << WIDX_OPEN_LIGHT)); // Only allow purchase of land when there is money - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) widgets[WIDX_BUY_LAND_RIGHTS].type = WidgetType::empty; else widgets[WIDX_BUY_LAND_RIGHTS].type = WidgetType::flatBtn; @@ -614,9 +614,9 @@ namespace OpenRCT2::Ui::Windows const auto& gameState = getGameState(); std::optional newFocus = std::nullopt; - if (!gameState.park.Entrances.empty()) + if (!gameState.park.entrances.empty()) { - const auto& entrance = gameState.park.Entrances[0]; + const auto& entrance = gameState.park.entrances[0]; newFocus = Focus(CoordsXYZ{ entrance.x + 16, entrance.y + 16, entrance.z + 32 }); } @@ -683,7 +683,7 @@ namespace OpenRCT2::Ui::Windows _ratingProps.min = 0; _ratingProps.max = 1000; - _ratingProps.series = getGameState().park.RatingHistory; + _ratingProps.series = getGameState().park.ratingHistory; const Widget* background = &widgets[WIDX_PAGE_BACKGROUND]; _ratingGraphBounds = { windowPos + ScreenCoordsXY{ background->left + 4, background->top + 15 }, windowPos + ScreenCoordsXY{ background->right - 4, background->bottom - 4 } }; @@ -707,7 +707,7 @@ namespace OpenRCT2::Ui::Windows // Current value Formatter ft; - ft.Add(getGameState().park.Rating); + ft.Add(getGameState().park.rating); DrawTextBasic(rt, windowPos + ScreenCoordsXY{ widget->left + 3, widget->top + 2 }, STR_PARK_RATING_LABEL, ft); // Graph border @@ -816,14 +816,14 @@ namespace OpenRCT2::Ui::Windows { case WIDX_INCREASE_PRICE: { - const auto newFee = std::min(kMaxEntranceFee, gameState.park.EntranceFee + 1.00_GBP); + const auto newFee = std::min(kMaxEntranceFee, gameState.park.entranceFee + 1.00_GBP); auto gameAction = ParkSetEntranceFeeAction(newFee); GameActions::Execute(&gameAction); break; } case WIDX_DECREASE_PRICE: { - const auto newFee = std::max(0.00_GBP, gameState.park.EntranceFee - 1.00_GBP); + const auto newFee = std::max(0.00_GBP, gameState.park.entranceFee - 1.00_GBP); auto gameAction = ParkSetEntranceFeeAction(newFee); GameActions::Execute(&gameAction); break; @@ -860,7 +860,7 @@ namespace OpenRCT2::Ui::Windows } // If the entry price is locked at free, disable the widget, unless the unlock_all_prices cheat is active. - if ((getGameState().park.Flags & PARK_FLAGS_NO_MONEY) || !Park::EntranceFeeUnlocked()) + if ((getGameState().park.flags & PARK_FLAGS_NO_MONEY) || !Park::EntranceFeeUnlocked()) { widgets[WIDX_PRICE].type = WidgetType::labelCentred; widgets[WIDX_INCREASE_PRICE].type = WidgetType::empty; @@ -946,7 +946,7 @@ namespace OpenRCT2::Ui::Windows auto& gameState = getGameState(); // Draw park size - auto parkSize = gameState.park.Size * 10; + auto parkSize = gameState.park.size * 10; auto stringIndex = STR_PARK_SIZE_METRIC_LABEL; if (Config::Get().general.MeasurementFormat == MeasurementFormat::Imperial) { @@ -1050,7 +1050,7 @@ namespace OpenRCT2::Ui::Windows PrepareWindowTitleText(); // Show name input button on scenario completion. - if (getGameState().park.Flags & PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT) + if (getGameState().park.flags & PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT) { widgets[WIDX_ENTER_NAME].type = WidgetType::button; widgets[WIDX_ENTER_NAME].top = height - 19; diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index ccb5d62658..19a1b8db20 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -79,7 +79,7 @@ namespace OpenRCT2::Ui::Windows auto currentRide = GetRide(rideId); if (currentRide != nullptr) { - auto stringId = (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) ? STR_REFURBISH_RIDE_ID_NO_MONEY + auto stringId = (getGameState().park.flags & PARK_FLAGS_NO_MONEY) ? STR_REFURBISH_RIDE_ID_NO_MONEY : STR_REFURBISH_RIDE_ID_MONEY; auto ft = Formatter(); currentRide->formatNameTo(ft); diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index b5562056c8..e6a0316bc6 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -530,7 +530,7 @@ namespace OpenRCT2::Ui::Windows const auto& gameState = getGameState(); auto widgetOffset = GetWidgetIndexOffset(baseWidgetIndex, WIDX_RESEARCH_FUNDING); - if ((gameState.park.Flags & PARK_FLAGS_NO_MONEY) || gameState.researchProgressStage == RESEARCH_STAGE_FINISHED_ALL) + if ((gameState.park.flags & PARK_FLAGS_NO_MONEY) || gameState.researchProgressStage == RESEARCH_STAGE_FINISHED_ALL) { w->widgets[WIDX_RESEARCH_FUNDING + widgetOffset].type = WidgetType::empty; w->widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON + widgetOffset].type = WidgetType::empty; @@ -575,7 +575,7 @@ namespace OpenRCT2::Ui::Windows void WindowResearchFundingDraw(WindowBase* w, RenderTarget& rt) { const auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) return; int32_t currentResearchLevel = gameState.researchFundingLevel; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 7f4c9e2630..b5fe033d3a 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1382,7 +1382,7 @@ namespace OpenRCT2::Ui::Windows } if (rtd.specialType == RtdSpecialType::cashMachine || rtd.specialType == RtdSpecialType::firstAid - || (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) != 0) + || (getGameState().park.flags & PARK_FLAGS_NO_MONEY) != 0) disabledTabs |= (1uLL << WIDX_TAB_9); // 0x1000 if (gLegacyScene == LegacyScene::trackDesigner) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 18ec9a07ad..598b16991d 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1712,7 +1712,7 @@ namespace OpenRCT2::Ui::Windows DrawTextBasic(rt, screenCoords, STR_BUILD_THIS, {}, { TextAlignment::CENTRE }); screenCoords.y += 11; - if (_currentTrackPrice != kMoney64Undefined && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (_currentTrackPrice != kMoney64Undefined && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(_currentTrackPrice); diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 23b163c6a9..e4960dd38e 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -318,7 +318,7 @@ namespace OpenRCT2::Ui::Windows int32_t selectedIndex = -1; for (int32_t type = INFORMATION_TYPE_STATUS; type <= lastType; type++) { - if ((getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if ((getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { if (ride_info_type_money_mapping[type]) { diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index bc92b369b1..47e03b4edf 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -867,7 +867,7 @@ namespace OpenRCT2::Ui::Windows } auto [name, price] = GetNameAndPrice(selectedSceneryEntry); - if (price != kMoney64Undefined && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (price != kMoney64Undefined && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(price); diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 19a2faeb27..27fee4d724 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -931,7 +931,7 @@ namespace OpenRCT2::Ui::Windows auto screenCoords = windowPos + ScreenCoordsXY{ widgets[WIDX_RESIZE].left + 4, widgets[WIDX_RESIZE].top + 4 }; - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(GetStaffWage(staff->AssignedStaffType)); diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 52d82009cd..4feb486dd7 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -274,7 +274,7 @@ namespace OpenRCT2::Ui::Windows DrawWidgets(rt); DrawTabImages(rt); - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto ft = Formatter(); ft.Add(GetStaffWage(GetSelectedStaffType())); diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index c1d905be3f..f8abc469eb 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -648,7 +648,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_PAUSE].type = WidgetType::empty; } - if ((getGameState().park.Flags & PARK_FLAGS_NO_MONEY) || !Config::Get().interface.ToolbarShowFinances) + if ((getGameState().park.flags & PARK_FLAGS_NO_MONEY) || !Config::Get().interface.ToolbarShowFinances) widgets[WIDX_FINANCES].type = WidgetType::empty; } diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 31bca5142c..a3d16248c7 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -354,7 +354,7 @@ namespace OpenRCT2::Ui::Windows } // Price - if (_placementCost != kMoney64Undefined && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (_placementCost != kMoney64Undefined && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { ft = Formatter(); ft.Add(_placementCost); diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 66edef18e5..281db038b8 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -163,7 +163,7 @@ namespace OpenRCT2::Ui::Windows rt, screenCoords - ScreenCoordsXY{ 0, 2 }, STR_LAND_TOOL_SIZE_VALUE, ft, { TextAlignment::CENTRE }); } - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { // Draw raise cost amount screenCoords = { widgets[WIDX_PREVIEW].midX() + windowPos.x, widgets[WIDX_PREVIEW].bottom + windowPos.y + 5 }; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index d145523dac..309cfa0371 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -111,7 +111,7 @@ namespace OpenRCT2::Editor gameStateInitAll(gameState, kDefaultMapSize); gLegacyScene = LegacyScene::scenarioEditor; gameState.editorStep = EditorStep::ObjectSelection; - gameState.park.Flags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; + gameState.park.flags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; gameState.scenarioCategory = ScenarioCategory::other; ObjectListLoad(); ViewportInitAll(); @@ -308,18 +308,18 @@ namespace OpenRCT2::Editor gameState.park.guestChangeModifier = 0; if (fromSave) { - gameState.park.Flags |= PARK_FLAGS_NO_MONEY; + gameState.park.flags |= PARK_FLAGS_NO_MONEY; - if (gameState.park.EntranceFee == 0) + if (gameState.park.entranceFee == 0) { - gameState.park.Flags |= PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags |= PARK_FLAGS_PARK_FREE_ENTRY; } else { - gameState.park.Flags &= ~PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags &= ~PARK_FLAGS_PARK_FREE_ENTRY; } - gameState.park.Flags &= ~PARK_FLAGS_SPRITES_INITIALISED; + gameState.park.flags &= ~PARK_FLAGS_SPRITES_INITIALISED; gameState.guestInitialCash = std::clamp(gameState.guestInitialCash, 10.00_GBP, kMaxEntranceFee); @@ -500,12 +500,12 @@ namespace OpenRCT2::Editor return { false, STR_PARK_MUST_OWN_SOME_LAND }; } - if (gameState.park.Entrances.empty()) + if (gameState.park.entrances.empty()) { return { false, STR_NO_PARK_ENTRANCES }; } - for (const auto& parkEntrance : gameState.park.Entrances) + for (const auto& parkEntrance : gameState.park.entrances) { int32_t direction = DirectionReverse(parkEntrance.direction); diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index d3546e811f..5437d02f78 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -584,11 +584,11 @@ void CheatSetAction::SetScenarioNoMoney(bool enabled) const auto& gameState = getGameState(); if (enabled) { - gameState.park.Flags |= PARK_FLAGS_NO_MONEY; + gameState.park.flags |= PARK_FLAGS_NO_MONEY; } else { - gameState.park.Flags &= ~PARK_FLAGS_NO_MONEY; + gameState.park.flags &= ~PARK_FLAGS_NO_MONEY; } // Invalidate all windows that have anything to do with finance diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index 967031b890..cb1613ce98 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -60,7 +60,7 @@ void LandSetHeightAction::Serialise(DataSerialiser& stream) GameActions::Result LandSetHeightAction::Query() const { auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) + if (gameState.park.flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) { return GameActions::Result(GameActions::Status::Disallowed, STR_FORBIDDEN_BY_THE_LOCAL_AUTHORITY, kStringIdNone); } @@ -82,7 +82,7 @@ GameActions::Result LandSetHeightAction::Query() const money64 sceneryRemovalCost = 0; if (!gameState.cheats.disableClearanceChecks) { - if (gameState.park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL) + if (gameState.park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL) { // Check for obstructing large trees TileElement* tileElement = CheckTreeObstructions(); diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index f6526a3c66..955f7b9931 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -90,7 +90,7 @@ GameActions::Result LargeSceneryRemoveAction::Query() const if (gLegacyScene != LegacyScene::scenarioEditor && !getGameState().cheats.sandboxMode) { - if (getGameState().park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL) + if (getGameState().park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL) { if (sceneryEntry->HasFlag(LARGE_SCENERY_FLAG_IS_TREE)) { diff --git a/src/openrct2/actions/ParkEntrancePlaceAction.cpp b/src/openrct2/actions/ParkEntrancePlaceAction.cpp index e54392fe10..44159c2a34 100644 --- a/src/openrct2/actions/ParkEntrancePlaceAction.cpp +++ b/src/openrct2/actions/ParkEntrancePlaceAction.cpp @@ -80,7 +80,7 @@ GameActions::Result ParkEntrancePlaceAction::Query() const } const auto& gameState = getGameState(); - if (gameState.park.Entrances.size() >= OpenRCT2::Limits::kMaxParkEntrances) + if (gameState.park.entrances.size() >= OpenRCT2::Limits::kMaxParkEntrances) { return GameActions::Result( GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_ERR_TOO_MANY_PARK_ENTRANCES); @@ -126,7 +126,7 @@ GameActions::Result ParkEntrancePlaceAction::Execute() const uint32_t flags = GetFlags(); - getGameState().park.Entrances.push_back(_loc); + getGameState().park.entrances.push_back(_loc); auto zLow = _loc.z; auto zHigh = zLow + ParkEntranceHeight; diff --git a/src/openrct2/actions/ParkEntranceRemoveAction.cpp b/src/openrct2/actions/ParkEntranceRemoveAction.cpp index f92edc0371..a48aabf91f 100644 --- a/src/openrct2/actions/ParkEntranceRemoveAction.cpp +++ b/src/openrct2/actions/ParkEntranceRemoveAction.cpp @@ -80,7 +80,7 @@ GameActions::Result ParkEntranceRemoveAction::Execute() const } auto& gameState = getGameState(); - auto direction = (gameState.park.Entrances[entranceIndex].direction - 1) & 3; + auto direction = (gameState.park.entrances[entranceIndex].direction - 1) & 3; // Centre (sign) ParkEntranceRemoveSegment(_loc); @@ -93,7 +93,7 @@ GameActions::Result ParkEntranceRemoveAction::Execute() const ParkEntranceRemoveSegment( { _loc.x - CoordsDirectionDelta[direction].x, _loc.y - CoordsDirectionDelta[direction].y, _loc.z }); - gameState.park.Entrances.erase(gameState.park.Entrances.begin() + entranceIndex); + gameState.park.entrances.erase(gameState.park.entrances.begin() + entranceIndex); return res; } diff --git a/src/openrct2/actions/ParkMarketingAction.cpp b/src/openrct2/actions/ParkMarketingAction.cpp index 7f65053aeb..09218ac460 100644 --- a/src/openrct2/actions/ParkMarketingAction.cpp +++ b/src/openrct2/actions/ParkMarketingAction.cpp @@ -55,7 +55,7 @@ GameActions::Result ParkMarketingAction::Query() const return GameActions::Result( GameActions::Status::InvalidParameters, STR_CANT_START_MARKETING_CAMPAIGN, STR_ERR_VALUE_OUT_OF_RANGE); } - if (getGameState().park.Flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) + if (getGameState().park.flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) { return GameActions::Result( GameActions::Status::Disallowed, STR_CANT_START_MARKETING_CAMPAIGN, diff --git a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp index 3e5647425e..52b2a8fe1e 100644 --- a/src/openrct2/actions/ParkSetEntranceFeeAction.cpp +++ b/src/openrct2/actions/ParkSetEntranceFeeAction.cpp @@ -43,7 +43,7 @@ void ParkSetEntranceFeeAction::Serialise(DataSerialiser& stream) GameActions::Result ParkSetEntranceFeeAction::Query() const { - if ((getGameState().park.Flags & PARK_FLAGS_NO_MONEY) != 0) + if ((getGameState().park.flags & PARK_FLAGS_NO_MONEY) != 0) { LOG_ERROR("Can't set park entrance fee because the park has no money"); return GameActions::Result(GameActions::Status::Disallowed, STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE, kStringIdNone); @@ -65,7 +65,7 @@ GameActions::Result ParkSetEntranceFeeAction::Query() const GameActions::Result ParkSetEntranceFeeAction::Execute() const { - getGameState().park.EntranceFee = _fee; + getGameState().park.entranceFee = _fee; auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByClass(WindowClass::ParkInformation); diff --git a/src/openrct2/actions/ParkSetNameAction.cpp b/src/openrct2/actions/ParkSetNameAction.cpp index 5584562bf9..ca66d9c508 100644 --- a/src/openrct2/actions/ParkSetNameAction.cpp +++ b/src/openrct2/actions/ParkSetNameAction.cpp @@ -57,9 +57,9 @@ GameActions::Result ParkSetNameAction::Execute() const { // Do a no-op if new name is the same as the current name is the same auto& park = getGameState().park; - if (_name != park.Name) + if (_name != park.name) { - park.Name = _name; + park.name = _name; ScrollingTextInvalidate(); GfxInvalidateScreen(); } diff --git a/src/openrct2/actions/ParkSetParameterAction.cpp b/src/openrct2/actions/ParkSetParameterAction.cpp index e5ed31c6d7..29977229b0 100644 --- a/src/openrct2/actions/ParkSetParameterAction.cpp +++ b/src/openrct2/actions/ParkSetParameterAction.cpp @@ -63,16 +63,16 @@ GameActions::Result ParkSetParameterAction::Execute() const switch (_parameter) { case ParkParameter::Close: - if (gameState.park.Flags & PARK_FLAGS_PARK_OPEN) + if (gameState.park.flags & PARK_FLAGS_PARK_OPEN) { - gameState.park.Flags &= ~PARK_FLAGS_PARK_OPEN; + gameState.park.flags &= ~PARK_FLAGS_PARK_OPEN; windowMgr->InvalidateByClass(WindowClass::ParkInformation); } break; case ParkParameter::Open: - if (!(gameState.park.Flags & PARK_FLAGS_PARK_OPEN)) + if (!(gameState.park.flags & PARK_FLAGS_PARK_OPEN)) { - gameState.park.Flags |= PARK_FLAGS_PARK_OPEN; + gameState.park.flags |= PARK_FLAGS_PARK_OPEN; windowMgr->InvalidateByClass(WindowClass::ParkInformation); } break; diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index f0a789fd98..57ed72a0d7 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -203,7 +203,7 @@ GameActions::Result RideCreateAction::Execute() const ride->ratings.setNull(); - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { for (auto i = 0; i < RCT2::ObjectLimits::kMaxShopItemsPerRideEntry; i++) { @@ -212,7 +212,7 @@ GameActions::Result RideCreateAction::Execute() const if (rideEntry->shop_item[0] == ShopItem::None) { - if (!Park::RidePricesUnlocked() || gameState.park.EntranceFee > 0) + if (!Park::RidePricesUnlocked() || gameState.park.entranceFee > 0) { ride->price[0] = 0; } diff --git a/src/openrct2/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp index 7a4f13d749..53fe6897f5 100644 --- a/src/openrct2/actions/RideDemolishAction.cpp +++ b/src/openrct2/actions/RideDemolishAction.cpp @@ -154,7 +154,7 @@ GameActions::Result RideDemolishAction::DemolishRide(Ride& ride) const } ride.remove(); - getGameState().park.Value = Park::CalculateParkValue(); + getGameState().park.value = Park::CalculateParkValue(); // Close windows related to the demolished ride auto* windowMgr = Ui::GetWindowManager(); diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index 7ea3dede7c..701ccfa1a2 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -56,22 +56,22 @@ GameActions::Result ScenarioSetSettingAction::Execute() const { if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_NO_MONEY; + gameState.park.flags |= PARK_FLAGS_NO_MONEY; } else { - gameState.park.Flags &= ~PARK_FLAGS_NO_MONEY; + gameState.park.flags &= ~PARK_FLAGS_NO_MONEY; } } else { if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_NO_MONEY; + gameState.park.flags |= PARK_FLAGS_NO_MONEY; } else { - gameState.park.Flags &= ~PARK_FLAGS_NO_MONEY; + gameState.park.flags &= ~PARK_FLAGS_NO_MONEY; } // Invalidate all windows that have anything to do with finance windowMgr->InvalidateByClass(WindowClass::Ride); @@ -105,11 +105,11 @@ GameActions::Result ScenarioSetSettingAction::Execute() const case ScenarioSetSetting::ForbidMarketingCampaigns: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_FORBID_MARKETING_CAMPAIGN; + gameState.park.flags |= PARK_FLAGS_FORBID_MARKETING_CAMPAIGN; } else { - gameState.park.Flags &= ~PARK_FLAGS_FORBID_MARKETING_CAMPAIGN; + gameState.park.flags &= ~PARK_FLAGS_FORBID_MARKETING_CAMPAIGN; } break; case ScenarioSetSetting::AverageCashPerGuest: @@ -127,21 +127,21 @@ GameActions::Result ScenarioSetSettingAction::Execute() const case ScenarioSetSetting::GuestsPreferLessIntenseRides: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + gameState.park.flags |= PARK_FLAGS_PREF_LESS_INTENSE_RIDES; } else { - gameState.park.Flags &= ~PARK_FLAGS_PREF_LESS_INTENSE_RIDES; + gameState.park.flags &= ~PARK_FLAGS_PREF_LESS_INTENSE_RIDES; } break; case ScenarioSetSetting::GuestsPreferMoreIntenseRides: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + gameState.park.flags |= PARK_FLAGS_PREF_MORE_INTENSE_RIDES; } else { - gameState.park.Flags &= ~PARK_FLAGS_PREF_MORE_INTENSE_RIDES; + gameState.park.flags &= ~PARK_FLAGS_PREF_MORE_INTENSE_RIDES; } break; case ScenarioSetSetting::CostToBuyLand: @@ -155,96 +155,96 @@ GameActions::Result ScenarioSetSettingAction::Execute() const { if (_value == 0) { - gameState.park.Flags |= PARK_FLAGS_PARK_FREE_ENTRY; - gameState.park.Flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; - gameState.park.EntranceFee = 0.00_GBP; + gameState.park.flags |= PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.entranceFee = 0.00_GBP; } else if (_value == 1) { - gameState.park.Flags &= ~PARK_FLAGS_PARK_FREE_ENTRY; - gameState.park.Flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; - gameState.park.EntranceFee = 10.00_GBP; + gameState.park.flags &= ~PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.entranceFee = 10.00_GBP; } else { - gameState.park.Flags |= PARK_FLAGS_PARK_FREE_ENTRY; - gameState.park.Flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; - gameState.park.EntranceFee = 10.00_GBP; + gameState.park.flags |= PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.entranceFee = 10.00_GBP; } } else { if (_value == 0) { - gameState.park.Flags |= PARK_FLAGS_PARK_FREE_ENTRY; - gameState.park.Flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.flags |= PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; } else if (_value == 1) { - gameState.park.Flags &= ~PARK_FLAGS_PARK_FREE_ENTRY; - gameState.park.Flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.flags &= ~PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags &= ~PARK_FLAGS_UNLOCK_ALL_PRICES; } else { - gameState.park.Flags |= PARK_FLAGS_PARK_FREE_ENTRY; - gameState.park.Flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.flags |= PARK_FLAGS_PARK_FREE_ENTRY; + gameState.park.flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; } windowMgr->InvalidateByClass(WindowClass::ParkInformation); windowMgr->InvalidateByClass(WindowClass::Ride); } break; case ScenarioSetSetting::ParkChargeEntryFee: - gameState.park.EntranceFee = std::clamp(_value, 0.00_GBP, kMaxEntranceFee); + gameState.park.entranceFee = std::clamp(_value, 0.00_GBP, kMaxEntranceFee); windowMgr->InvalidateByClass(WindowClass::ParkInformation); break; case ScenarioSetSetting::ForbidTreeRemoval: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_FORBID_TREE_REMOVAL; + gameState.park.flags |= PARK_FLAGS_FORBID_TREE_REMOVAL; } else { - gameState.park.Flags &= ~PARK_FLAGS_FORBID_TREE_REMOVAL; + gameState.park.flags &= ~PARK_FLAGS_FORBID_TREE_REMOVAL; } break; case ScenarioSetSetting::ForbidLandscapeChanges: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_FORBID_LANDSCAPE_CHANGES; + gameState.park.flags |= PARK_FLAGS_FORBID_LANDSCAPE_CHANGES; } else { - gameState.park.Flags &= ~PARK_FLAGS_FORBID_LANDSCAPE_CHANGES; + gameState.park.flags &= ~PARK_FLAGS_FORBID_LANDSCAPE_CHANGES; } break; case ScenarioSetSetting::ForbidHighConstruction: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; + gameState.park.flags |= PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; } else { - gameState.park.Flags &= ~PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; + gameState.park.flags &= ~PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; } break; case ScenarioSetSetting::ParkRatingHigherDifficultyLevel: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_DIFFICULT_PARK_RATING; + gameState.park.flags |= PARK_FLAGS_DIFFICULT_PARK_RATING; } else { - gameState.park.Flags &= ~PARK_FLAGS_DIFFICULT_PARK_RATING; + gameState.park.flags &= ~PARK_FLAGS_DIFFICULT_PARK_RATING; } break; case ScenarioSetSetting::GuestGenerationHigherDifficultyLevel: if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_DIFFICULT_GUEST_GENERATION; + gameState.park.flags |= PARK_FLAGS_DIFFICULT_GUEST_GENERATION; } else { - gameState.park.Flags &= ~PARK_FLAGS_DIFFICULT_GUEST_GENERATION; + gameState.park.flags &= ~PARK_FLAGS_DIFFICULT_GUEST_GENERATION; } break; case ScenarioSetSetting::AllowEarlyCompletion: @@ -254,11 +254,11 @@ GameActions::Result ScenarioSetSettingAction::Execute() const { if (_value != 0) { - gameState.park.Flags |= PARK_FLAGS_RCT1_INTEREST; + gameState.park.flags |= PARK_FLAGS_RCT1_INTEREST; } else { - gameState.park.Flags &= ~PARK_FLAGS_RCT1_INTEREST; + gameState.park.flags &= ~PARK_FLAGS_RCT1_INTEREST; } break; } diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index 31886c2e31..4e13cc2a64 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -78,7 +78,7 @@ GameActions::Result SmallSceneryRemoveAction::Query() const && !getGameState().cheats.sandboxMode) { // Check if allowed to remove item - if (getGameState().park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL) + if (getGameState().park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL) { if (entry->HasFlag(SMALL_SCENERY_FLAG_IS_TREE)) { diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 5c7b4063fc..5be4c61e7b 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -281,10 +281,10 @@ void StaffHireNewAction::AutoPositionNewStaff(Peep* newPeep) const { // No walking guests; pick random park entrance const auto& gameState = getGameState(); - if (!gameState.park.Entrances.empty()) + if (!gameState.park.entrances.empty()) { - auto rand = ScenarioRandMax(static_cast(gameState.park.Entrances.size())); - const auto& entrance = gameState.park.Entrances[rand]; + auto rand = ScenarioRandMax(static_cast(gameState.park.entrances.size())); + const auto& entrance = gameState.park.entrances[rand]; auto dir = entrance.direction; newLocation = entrance; // TODO: Replace with CoordsDirectionDelta diff --git a/src/openrct2/actions/SurfaceSetStyleAction.cpp b/src/openrct2/actions/SurfaceSetStyleAction.cpp index 51a7a03dd2..8d5cfc3559 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.cpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.cpp @@ -89,7 +89,7 @@ GameActions::Result SurfaceSetStyleAction::Query() const // Do nothing if not in editor, sandbox mode or landscaping is forbidden if (gLegacyScene != LegacyScene::scenarioEditor && !gameState.cheats.sandboxMode - && (gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES)) + && (gameState.park.flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES)) { return GameActions::Result( GameActions::Status::Disallowed, STR_CANT_CHANGE_LAND_TYPE, STR_FORBIDDEN_BY_THE_LOCAL_AUTHORITY); diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp index 64dd87c871..a716272af9 100644 --- a/src/openrct2/actions/WaterSetHeightAction.cpp +++ b/src/openrct2/actions/WaterSetHeightAction.cpp @@ -53,7 +53,7 @@ GameActions::Result WaterSetHeightAction::Query() const auto& gameState = getGameState(); if (gLegacyScene != LegacyScene::scenarioEditor && !gameState.cheats.sandboxMode - && gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) + && gameState.park.flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) { return GameActions::Result(GameActions::Status::Disallowed, kStringIdNone, STR_FORBIDDEN_BY_THE_LOCAL_AUTHORITY); } diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 3c1072e7c2..05cfbf1067 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1108,7 +1108,7 @@ void Guest::Tick128UpdateGuest(uint32_t index) possible_thoughts[num_thoughts++] = PeepThoughtType::Toilet; } - if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY) && CashInPocket <= 9.00_GBP && Happiness >= 105 + if (!(getGameState().park.flags & PARK_FLAGS_NO_MONEY) && CashInPocket <= 9.00_GBP && Happiness >= 105 && Energy >= 70) { /* The energy check was originally a second check on happiness. @@ -1589,7 +1589,7 @@ static bool GuestDecideAndBuyItem(Guest& guest, Ride& ride, const ShopItem shopI if (!hasVoucher) { - if (price != 0 && !(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (price != 0 && !(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { if (guest.CashInPocket == 0) { @@ -1630,7 +1630,7 @@ static bool GuestDecideAndBuyItem(Guest& guest, Ride& ride, const ShopItem shopI itemValue -= price; itemValue = std::max(0.80_GBP, itemValue); - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { if (itemValue >= static_cast(ScenarioRand() & 0x07)) { @@ -1730,7 +1730,7 @@ static bool GuestDecideAndBuyItem(Guest& guest, Ride& ride, const ShopItem shopI expenditure = ExpenditureType::FoodDrinkStock; } - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) FinancePayment(shopItemDescriptor.Cost, expenditure); // Sets the expenditure type to *_FOODDRINK_SALES or *_SHOP_SALES appropriately. @@ -1740,7 +1740,7 @@ static bool GuestDecideAndBuyItem(Guest& guest, Ride& ride, const ShopItem shopI guest.RemoveItem(ShopItem::Voucher); guest.WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY; } - else if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + else if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { guest.SpendMoney(*expend_type, price, expenditure); } @@ -2042,7 +2042,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b auto& gameState = getGameState(); // Basic price checks - if (ridePrice != 0 && !GuestHasVoucherForFreeRide(*this, ride) && !(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (ridePrice != 0 && !GuestHasVoucherForFreeRide(*this, ride) && !(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { if (ridePrice > CashInPocket) { @@ -2192,7 +2192,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // If the value of the ride hasn't yet been calculated, peeps will be willing to pay any amount for the ride. if (value != kRideValueUndefined && !GuestHasVoucherForFreeRide(*this, ride) - && !(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + && !(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { // The amount peeps are willing to pay is decreased by 75% if they had to pay to enter the park. if (PeepFlags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY) @@ -2218,7 +2218,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // A ride is good value if the price is 50% or less of the ride value and the peep didn't pay to enter the park. if (ridePrice <= (value / 2) && peepAtRide) { - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { if (!(PeepFlags & PEEP_FLAGS_HAS_PAID_FOR_PARK_ENTRY)) { @@ -2337,7 +2337,7 @@ void Guest::SpendMoney(money64 amount, ExpenditureType expenditure) */ void Guest::SpendMoney(money64& peep_expend_type, money64 amount, ExpenditureType expenditure) { - assert(!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)); + assert(!(getGameState().park.flags & PARK_FLAGS_NO_MONEY)); CashInPocket = std::max(0.00_GBP, static_cast(CashInPocket) - amount); CashSpent += amount; @@ -2654,7 +2654,7 @@ static bool PeepCheckRidePriceAtEntrance(Guest& guest, const Ride& ride, money64 && guest.VoucherRideId == guest.CurrentRide) return true; - if (guest.CashInPocket <= 0 && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (guest.CashInPocket <= 0 && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { guest.InsertNewThought(PeepThoughtType::SpentMoney); PeepUpdateRideAtEntranceTryLeave(guest); @@ -2748,7 +2748,7 @@ static void GuestUpdateFavouriteRide(Guest& guest, const Ride& ride, uint8_t sat /* rct2: 0x00695555 */ static int16_t GuestCalculateRideValueSatisfaction(Guest& guest, const Ride& ride) { - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) { return -30; } @@ -2922,7 +2922,7 @@ static bool GuestShouldGoOnRideAgain(Guest& guest, const Ride& ride) static bool GuestShouldPreferredIntensityIncrease(Guest& guest) { - if (getGameState().park.Flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) + if (getGameState().park.flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) return false; if (guest.Happiness < 200) return false; @@ -3107,7 +3107,7 @@ static void GuestDecideWhetherToLeavePark(Guest& guest) * in the park. */ if (!(guest.PeepFlags & PEEP_FLAGS_LEAVING_PARK)) { - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) { if (guest.Energy >= 70 && guest.Happiness >= 60) { @@ -3345,7 +3345,7 @@ static void GuestStopPurchaseThought(Guest& guest, ride_type_t rideType) */ static bool PeepShouldUseCashMachine(Guest& guest, RideId rideIndex) { - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) return false; if (guest.PeepFlags & PEEP_FLAGS_LEAVING_PARK) return false; @@ -7308,9 +7308,9 @@ Guest* Guest::Generate(const CoordsXYZ& coords) /* Check which intensity boxes are enabled * and apply the appropriate intensity settings. */ - if (gameState.park.Flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) + if (gameState.park.flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) { - if (gameState.park.Flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) + if (gameState.park.flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) { intensityLowest = 0; intensityHighest = 15; @@ -7321,7 +7321,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords) intensityHighest = 4; } } - else if (gameState.park.Flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) + else if (gameState.park.flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) { intensityLowest = 9; intensityHighest = 15; @@ -7330,7 +7330,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords) peep->Intensity = IntensityRange(intensityLowest, intensityHighest); uint8_t nauseaTolerance = ScenarioRand() & 0x7; - if (gameState.park.Flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) + if (gameState.park.flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) { nauseaTolerance += 4; } @@ -7387,7 +7387,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords) cash = 500; } - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) { cash = 0; } diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 258db6f2e7..9011eaf580 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -788,7 +788,7 @@ void Peep::UpdateFalling() } auto& gameState = getGameState(); - gameState.park.RatingCasualtyPenalty = std::min(gameState.park.RatingCasualtyPenalty + 25, 1000); + gameState.park.ratingCasualtyPenalty = std::min(gameState.park.ratingCasualtyPenalty + 25, 1000); Remove(); return; } @@ -1475,8 +1475,8 @@ void Peep::FormatNameTo(Formatter& ft) const if (Name == nullptr) { auto& gameState = getGameState(); - const bool showGuestNames = gameState.park.Flags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES; - const bool showStaffNames = gameState.park.Flags & PARK_FLAGS_SHOW_REAL_STAFF_NAMES; + const bool showGuestNames = gameState.park.flags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES; + const bool showStaffNames = gameState.park.flags & PARK_FLAGS_SHOW_REAL_STAFF_NAMES; auto* staff = As(); const bool isStaff = staff != nullptr; @@ -1770,7 +1770,7 @@ static bool PeepInteractWithEntrance(Peep* peep, const CoordsXYE& coords, uint8_ if (!(guest->PeepFlags & PEEP_FLAGS_LEAVING_PARK)) { // If the park is open and leaving flag isn't set return to centre - if (gameState.park.Flags & PARK_FLAGS_PARK_OPEN) + if (gameState.park.flags & PARK_FLAGS_PARK_OPEN) { PeepReturnToCentreOfTile(guest); return true; @@ -1803,7 +1803,7 @@ static bool PeepInteractWithEntrance(Peep* peep, const CoordsXYE& coords, uint8_ return true; } - if (!(gameState.park.Flags & PARK_FLAGS_PARK_OPEN)) + if (!(gameState.park.flags & PARK_FLAGS_PARK_OPEN)) { guest->State = PeepState::LeavingPark; guest->Var37 = 1; @@ -1814,10 +1814,10 @@ static bool PeepInteractWithEntrance(Peep* peep, const CoordsXYE& coords, uint8_ } bool found = false; - auto entrance = std::find_if(gameState.park.Entrances.begin(), gameState.park.Entrances.end(), [coords](const auto& e) { + auto entrance = std::find_if(gameState.park.entrances.begin(), gameState.park.entrances.end(), [coords](const auto& e) { return coords.ToTileStart() == e; }); - if (entrance != gameState.park.Entrances.end()) + if (entrance != gameState.park.entrances.end()) { int16_t z = entrance->z / 8; entranceDirection = entrance->direction; @@ -2273,7 +2273,7 @@ static bool PeepInteractWithShop(Peep* peep, const CoordsXYE& coords) } auto cost = ride->price[0]; - if (cost != 0 && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (cost != 0 && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { ride->totalProfit = AddClamp(ride->totalProfit, cost); ride->windowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME; @@ -2540,7 +2540,7 @@ int32_t PeepCompare(const EntityId sprite_index_a, const EntityId sprite_index_b if (peep_a->Name == nullptr && peep_b->Name == nullptr) { - if (getGameState().park.Flags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES) + if (getGameState().park.flags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES) { // Potentially could find a more optional way of sorting dynamic real names } @@ -2574,14 +2574,14 @@ void PeepUpdateNames() auto& config = Config::Get().general; if (config.ShowRealNamesOfGuests) - gameState.park.Flags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; + gameState.park.flags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; else - gameState.park.Flags &= ~PARK_FLAGS_SHOW_REAL_GUEST_NAMES; + gameState.park.flags &= ~PARK_FLAGS_SHOW_REAL_GUEST_NAMES; if (config.ShowRealNamesOfStaff) - gameState.park.Flags |= PARK_FLAGS_SHOW_REAL_STAFF_NAMES; + gameState.park.flags |= PARK_FLAGS_SHOW_REAL_STAFF_NAMES; else - gameState.park.Flags &= ~PARK_FLAGS_SHOW_REAL_STAFF_NAMES; + gameState.park.flags &= ~PARK_FLAGS_SHOW_REAL_STAFF_NAMES; auto intent = Intent(INTENT_ACTION_REFRESH_GUEST_LIST); ContextBroadcastIntent(&intent); diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index e5e11decfc..f788144554 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -549,11 +549,11 @@ static void ConsoleCommandGet(InteractiveConsole& console, const arguments_t& ar { if (argv[0] == "park_rating") { - console.WriteFormatLine("park_rating %d", gameState.park.Rating); + console.WriteFormatLine("park_rating %d", gameState.park.rating); } else if (argv[0] == "park_value") { - console.WriteLine(FormatString("park_value {CURRENCY2DP}", gameState.park.Value)); + console.WriteLine(FormatString("park_value {CURRENCY2DP}", gameState.park.value)); } else if (argv[0] == "company_value") { @@ -618,52 +618,52 @@ static void ConsoleCommandGet(InteractiveConsole& console, const arguments_t& ar else if (argv[0] == "guest_prefer_less_intense_rides") { console.WriteFormatLine( - "guest_prefer_less_intense_rides %d", (gameState.park.Flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) != 0); + "guest_prefer_less_intense_rides %d", (gameState.park.flags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES) != 0); } else if (argv[0] == "guest_prefer_more_intense_rides") { console.WriteFormatLine( - "guest_prefer_more_intense_rides %d", (gameState.park.Flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) != 0); + "guest_prefer_more_intense_rides %d", (gameState.park.flags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES) != 0); } else if (argv[0] == "forbid_marketing_campaigns") { console.WriteFormatLine( - "forbid_marketing_campaigns %d", (gameState.park.Flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) != 0); + "forbid_marketing_campaigns %d", (gameState.park.flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN) != 0); } else if (argv[0] == "forbid_landscape_changes") { console.WriteFormatLine( - "forbid_landscape_changes %d", (gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) != 0); + "forbid_landscape_changes %d", (gameState.park.flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES) != 0); } else if (argv[0] == "forbid_tree_removal") { - console.WriteFormatLine("forbid_tree_removal %d", (gameState.park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL) != 0); + console.WriteFormatLine("forbid_tree_removal %d", (gameState.park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL) != 0); } else if (argv[0] == "forbid_high_construction") { console.WriteFormatLine( - "forbid_high_construction %d", (gameState.park.Flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION) != 0); + "forbid_high_construction %d", (gameState.park.flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION) != 0); } else if (argv[0] == "pay_for_rides") { - console.WriteFormatLine("pay_for_rides %d", (gameState.park.Flags & PARK_FLAGS_PARK_FREE_ENTRY) != 0); + console.WriteFormatLine("pay_for_rides %d", (gameState.park.flags & PARK_FLAGS_PARK_FREE_ENTRY) != 0); } else if (argv[0] == "no_money") { - console.WriteFormatLine("no_money %d", (gameState.park.Flags & PARK_FLAGS_NO_MONEY) != 0); + console.WriteFormatLine("no_money %d", (gameState.park.flags & PARK_FLAGS_NO_MONEY) != 0); } else if (argv[0] == "difficult_park_rating") { - console.WriteFormatLine("difficult_park_rating %d", (gameState.park.Flags & PARK_FLAGS_DIFFICULT_PARK_RATING) != 0); + console.WriteFormatLine("difficult_park_rating %d", (gameState.park.flags & PARK_FLAGS_DIFFICULT_PARK_RATING) != 0); } else if (argv[0] == "difficult_guest_generation") { console.WriteFormatLine( - "difficult_guest_generation %d", (gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0); + "difficult_guest_generation %d", (gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0); } else if (argv[0] == "park_open") { - console.WriteFormatLine("park_open %d", (gameState.park.Flags & PARK_FLAGS_PARK_OPEN) != 0); + console.WriteFormatLine("park_open %d", (gameState.park.flags & PARK_FLAGS_PARK_OPEN) != 0); } else if (argv[0] == "game_speed") { @@ -868,7 +868,7 @@ static void ConsoleCommandSet(InteractiveConsole& console, const arguments_t& ar } else if (varName == "pay_for_rides" && InvalidArguments(&invalidArgs, int_valid[0])) { - SET_FLAG(gameState.park.Flags, PARK_FLAGS_PARK_FREE_ENTRY, int_val[0]); + SET_FLAG(gameState.park.flags, PARK_FLAGS_PARK_FREE_ENTRY, int_val[0]); console.Execute("get pay_for_rides"); } else if (varName == "no_money" && InvalidArguments(&invalidArgs, int_valid[0])) diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 366c63d847..acaaafea15 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -112,7 +112,7 @@ void ScreenshotCheck() static std::string ScreenshotGetParkName() { - return getGameState().park.Name; + return getGameState().park.name; } static std::string ScreenshotGetDirectory() diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 4906edbac8..f0fd89d061 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -181,7 +181,7 @@ static bool AwardIsDeservedBestValue(int32_t activeAwardTypes) if (activeAwardTypes & EnumToFlag(AwardType::MostDisappointing)) return false; - if ((gameState.park.Flags & PARK_FLAGS_NO_MONEY) || !Park::EntranceFeeUnlocked()) + if ((gameState.park.flags & PARK_FLAGS_NO_MONEY) || !Park::EntranceFeeUnlocked()) return false; if (gameState.park.totalRideValueForMoney < 10.00_GBP) @@ -233,7 +233,7 @@ static bool AwardIsDeservedWorstValue(int32_t activeAwardTypes) if (activeAwardTypes & EnumToFlag(AwardType::BestValue)) return false; - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) return false; const auto parkEntranceFee = Park::GetEntranceFee(); @@ -412,7 +412,7 @@ static bool AwardIsDeservedMostDisappointing(int32_t activeAwardTypes) { if (activeAwardTypes & EnumToFlag(AwardType::BestValue)) return false; - if (getGameState().park.Rating > 650) + if (getGameState().park.rating > 650) return false; // Count the number of disappointing rides @@ -641,7 +641,7 @@ void AwardUpdateAll() } // Only add new awards if park is open - if (gameState.park.Flags & PARK_FLAGS_PARK_OPEN) + if (gameState.park.flags & PARK_FLAGS_PARK_OPEN) { // Set active award types as flags int32_t activeAwardTypes = 0; diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index ff1b98e0bf..56e42e36d0 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -47,7 +47,7 @@ static constexpr int32_t dword_988E60[EnumValue(ExpenditureType::Count)] = { */ bool FinanceCheckMoneyRequired(uint32_t flags) { - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) return false; if (isInEditorMode()) return false; @@ -99,7 +99,7 @@ void FinancePayWages() { PROFILED_FUNCTION(); - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) { return; } @@ -117,7 +117,7 @@ void FinancePayWages() void FinancePayResearch() { const auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) { return; } @@ -134,7 +134,7 @@ void FinancePayInterest() { const auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) { return; } @@ -143,7 +143,7 @@ void FinancePayInterest() // that will overflow money64 if the loan is greater than (1 << 31) / (5 * current_interest_rate) const money64 current_loan = gameState.park.bankLoan; const auto current_interest_rate = gameState.park.bankLoanInterestRate; - const money64 interest_to_pay = (gameState.park.Flags & PARK_FLAGS_RCT1_INTEREST) + const money64 interest_to_pay = (gameState.park.flags & PARK_FLAGS_RCT1_INTEREST) ? (current_loan / 2400) : (current_loan * 5 * current_interest_rate) >> 14; @@ -165,7 +165,7 @@ void FinancePayRideUpkeep() ride.renew(); } - if (ride.status != RideStatus::closed && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) + if (ride.status != RideStatus::closed && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY)) { auto upkeep = ride.upkeepCost; if (upkeep != kMoney64Undefined) @@ -190,7 +190,7 @@ void FinanceResetHistory() { gameState.park.cashHistory[i] = kMoney64Undefined; gameState.park.weeklyProfitHistory[i] = kMoney64Undefined; - gameState.park.ValueHistory[i] = kMoney64Undefined; + gameState.park.valueHistory[i] = kMoney64Undefined; } for (uint32_t i = 0; i < kExpenditureTableMonthCount; ++i) @@ -229,7 +229,7 @@ void FinanceInit() gameState.park.maxBankLoan = 20000.00_GBP; gameState.park.bankLoanInterestRate = 10; - gameState.park.Value = 0; + gameState.park.value = 0; gameState.park.companyValue = 0; gameState.park.historicalProfit = 0; gameState.scenarioCompletedCompanyValue = kMoney64Undefined; @@ -252,7 +252,7 @@ void FinanceUpdateDailyProfit() money64 current_profit = 0; - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { // Staff costs for (auto peep : EntityList()) diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 5927ff7bca..605dd7ae08 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -326,7 +326,7 @@ void ResearchUpdate() return; } - if ((gameState.park.Flags & PARK_FLAGS_NO_MONEY) && gameState.researchFundingLevel == RESEARCH_FUNDING_NONE) + if ((gameState.park.flags & PARK_FLAGS_NO_MONEY) && gameState.researchFundingLevel == RESEARCH_FUNDING_NONE) { researchLevel = RESEARCH_FUNDING_NORMAL; } diff --git a/src/openrct2/network/DiscordService.cpp b/src/openrct2/network/DiscordService.cpp index 22471ae1fa..c4b3f35d31 100644 --- a/src/openrct2/network/DiscordService.cpp +++ b/src/openrct2/network/DiscordService.cpp @@ -67,7 +67,7 @@ DiscordService::~DiscordService() static std::string GetParkName() { auto& gameState = getGameState(); - return gameState.park.Name; + return gameState.park.name; } void DiscordService::Tick() diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index f03909882e..ec0b5bac17 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -311,10 +311,10 @@ private: { "day", date.GetMonthTicks() }, { "month", date.GetMonthsElapsed() }, { "guests", gameState.park.numGuestsInPark }, - { "parkValue", gameState.park.Value }, + { "parkValue", gameState.park.value }, }; - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY)) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY)) { gameInfo["cash"] = gameState.park.cash; } diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index b2323920d2..bdf8c3f39c 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -234,10 +234,10 @@ static void PaintParkEntranceScrollingText( auto ft = Formatter(); auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_PARK_OPEN) + if (gameState.park.flags & PARK_FLAGS_PARK_OPEN) { const auto& park = gameState.park; - auto name = park.Name.c_str(); + auto name = park.name.c_str(); ft.Add(STR_STRING); ft.Add(name); } diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 81e42b91f7..18ca7dae63 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -486,7 +486,7 @@ namespace OpenRCT2 os.readWriteChunk(ParkFileChunkType::SCENARIO, [&gameState, &os](OrcaStream::ChunkStream& cs) { cs.readWrite(gameState.scenarioCategory); ReadWriteStringTable(cs, gameState.scenarioName, "en-GB"); - ReadWriteStringTable(cs, gameState.park.Name, "en-GB"); + ReadWriteStringTable(cs, gameState.park.name, "en-GB"); ReadWriteStringTable(cs, gameState.scenarioDetails, "en-GB"); cs.readWrite(gameState.scenarioObjective.Type); @@ -892,21 +892,21 @@ namespace OpenRCT2 { os.readWriteChunk( ParkFileChunkType::PARK, [version = os.getHeader().targetVersion, &gameState](OrcaStream::ChunkStream& cs) { - cs.readWrite(gameState.park.Name); + cs.readWrite(gameState.park.name); cs.readWrite(gameState.park.cash); cs.readWrite(gameState.park.bankLoan); cs.readWrite(gameState.park.maxBankLoan); cs.readWrite(gameState.park.bankLoanInterestRate); - cs.readWrite(gameState.park.Flags); + cs.readWrite(gameState.park.flags); if (version <= 18) { money16 tempParkEntranceFee{}; cs.readWrite(tempParkEntranceFee); - gameState.park.EntranceFee = ToMoney64(tempParkEntranceFee); + gameState.park.entranceFee = ToMoney64(tempParkEntranceFee); } else { - cs.readWrite(gameState.park.EntranceFee); + cs.readWrite(gameState.park.entranceFee); } cs.readWrite(gameState.park.staffHandymanColour); @@ -976,13 +976,13 @@ namespace OpenRCT2 cs.readWrite(award.Type); }); } - cs.readWrite(gameState.park.Value); + cs.readWrite(gameState.park.value); cs.readWrite(gameState.park.companyValue); - cs.readWrite(gameState.park.Size); + cs.readWrite(gameState.park.size); cs.readWrite(gameState.park.numGuestsInPark); cs.readWrite(gameState.park.numGuestsHeadingForPark); - cs.readWrite(gameState.park.Rating); - cs.readWrite(gameState.park.RatingCasualtyPenalty); + cs.readWrite(gameState.park.rating); + cs.readWrite(gameState.park.ratingCasualtyPenalty); cs.readWrite(gameState.park.currentExpenditure); cs.readWrite(gameState.park.currentProfit); cs.readWrite(gameState.park.weeklyProfitAverageDividend); @@ -1021,10 +1021,10 @@ namespace OpenRCT2 for (int i = 0; i < kParkRatingHistorySize; i++) { if (smallHistory[i] == kRCT12ParkHistoryUndefined) - gameState.park.RatingHistory[i] = kParkRatingHistoryUndefined; + gameState.park.ratingHistory[i] = kParkRatingHistoryUndefined; else { - gameState.park.RatingHistory[i] = static_cast( + gameState.park.ratingHistory[i] = static_cast( smallHistory[i] * kRCT12ParkRatingHistoryFactor); } } @@ -1034,12 +1034,12 @@ namespace OpenRCT2 uint8_t smallHistory[kParkRatingHistorySize]; for (int i = 0; i < kParkRatingHistorySize; i++) { - if (gameState.park.RatingHistory[i] == kParkRatingHistoryUndefined) + if (gameState.park.ratingHistory[i] == kParkRatingHistoryUndefined) smallHistory[i] = kRCT12ParkHistoryUndefined; else { smallHistory[i] = static_cast( - gameState.park.RatingHistory[i] / kRCT12ParkRatingHistoryFactor); + gameState.park.ratingHistory[i] / kRCT12ParkRatingHistoryFactor); } } cs.readWriteArray(smallHistory, [&cs](uint8_t& value) { @@ -1050,7 +1050,7 @@ namespace OpenRCT2 } else { - cs.readWriteArray(gameState.park.RatingHistory, [&cs](uint16_t& value) { + cs.readWriteArray(gameState.park.ratingHistory, [&cs](uint16_t& value) { cs.readWrite(value); return true; }); @@ -1069,7 +1069,7 @@ namespace OpenRCT2 cs.readWrite(value); return true; }); - cs.readWriteArray(gameState.park.ValueHistory, [&cs](money64& value) { + cs.readWriteArray(gameState.park.valueHistory, [&cs](money64& value) { cs.readWrite(value); return true; }); diff --git a/src/openrct2/park/ParkPreview.cpp b/src/openrct2/park/ParkPreview.cpp index 19dbed2703..e43f4bece6 100644 --- a/src/openrct2/park/ParkPreview.cpp +++ b/src/openrct2/park/ParkPreview.cpp @@ -32,12 +32,12 @@ namespace OpenRCT2 ParkPreview generatePreviewFromGameState(const GameState_t& gameState) { ParkPreview preview{ - .parkName = gameState.park.Name, - .parkRating = gameState.park.Rating, + .parkName = gameState.park.name, + .parkRating = gameState.park.rating, .year = gameState.date.GetYear(), .month = gameState.date.GetMonth(), .day = gameState.date.GetDay(), - .parkUsesMoney = !(gameState.park.Flags & PARK_FLAGS_NO_MONEY), + .parkUsesMoney = !(gameState.park.flags & PARK_FLAGS_NO_MONEY), .cash = gameState.park.cash, .numRides = static_cast(RideManager().size()), .numGuests = static_cast(gameState.park.numGuestsInPark), @@ -191,9 +191,9 @@ namespace OpenRCT2 const auto mapPos = ViewportPosToMapPos(centre, 24, mainViewport->rotation); mapPosXYZD = CoordsXYZD(mapPos.x, mapPos.y, int32_t{ TileElementHeight(mapPos) }, mainViewport->rotation); } - else if (!gameState.park.Entrances.empty()) + else if (!gameState.park.entrances.empty()) { - const auto& entrance = gameState.park.Entrances[0]; + const auto& entrance = gameState.park.entrances[0]; mapPosXYZD = CoordsXYZD(entrance.x + 16, entrance.y + 16, entrance.z + 32, DirectionReverse(entrance.direction)); } else diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index bd9f21f485..30cf341377 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -1573,7 +1573,7 @@ namespace OpenRCT2::PathFinding { std::optional chosenEntrance = std::nullopt; uint16_t nearestDist = 0xFFFF; - for (const auto& parkEntrance : getGameState().park.Entrances) + for (const auto& parkEntrance : getGameState().park.entrances) { auto dist = abs(parkEntrance.x - loc.x) + abs(parkEntrance.y - loc.y); if (dist < nearestDist) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 37997bc4be..413024bfb8 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -357,7 +357,7 @@ namespace OpenRCT2::RCT1 // Do map initialisation, same kind of stuff done when loading scenario editor gameStateInitAll(gameState, { mapSize, mapSize }); gameState.editorStep = EditorStep::ObjectSelection; - gameState.park.Flags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; + gameState.park.flags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES; gameState.scenarioCategory = ScenarioCategory::other; } @@ -1500,7 +1500,7 @@ namespace OpenRCT2::RCT1 void ImportFinance(GameState_t& gameState) { - gameState.park.EntranceFee = _s4.ParkEntranceFee; + gameState.park.entranceFee = _s4.ParkEntranceFee; gameState.landPrice = ToMoney64(_s4.LandPrice); gameState.constructionRightsPrice = ToMoney64(_s4.ConstructionRightsPrice); @@ -1512,13 +1512,13 @@ namespace OpenRCT2::RCT1 gameState.initialCash = ToMoney64(_s4.Cash); gameState.park.companyValue = ToMoney64(_s4.CompanyValue); - gameState.park.Value = CorrectRCT1ParkValue(_s4.ParkValue); + gameState.park.value = CorrectRCT1ParkValue(_s4.ParkValue); gameState.park.currentProfit = ToMoney64(_s4.Profit); for (size_t i = 0; i < Limits::kFinanceGraphSize; i++) { gameState.park.cashHistory[i] = ToMoney64(_s4.CashHistory[i]); - gameState.park.ValueHistory[i] = CorrectRCT1ParkValue(_s4.ParkValueHistory[i]); + gameState.park.valueHistory[i] = CorrectRCT1ParkValue(_s4.ParkValueHistory[i]); gameState.park.weeklyProfitHistory[i] = ToMoney64(_s4.WeeklyProfitHistory[i]); } @@ -2214,7 +2214,7 @@ namespace OpenRCT2::RCT1 } auto& park = gameState.park; - park.Name = std::move(parkName); + park.name = std::move(parkName); } std::vector convertNewsQueue(std::span queue) @@ -2263,14 +2263,14 @@ namespace OpenRCT2::RCT1 gameState.date = Date{ _s4.Month, _s4.Day }; // Park rating - gameState.park.Rating = _s4.ParkRating; + gameState.park.rating = _s4.ParkRating; Park::ResetHistories(gameState); for (size_t i = 0; i < std::size(_s4.ParkRatingHistory); i++) { if (_s4.ParkRatingHistory[i] != kRCT12ParkHistoryUndefined) { - gameState.park.RatingHistory[i] = _s4.ParkRatingHistory[i] * kRCT12ParkRatingHistoryFactor; + gameState.park.ratingHistory[i] = _s4.ParkRatingHistory[i] * kRCT12ParkRatingHistoryFactor; } } for (size_t i = 0; i < std::size(_s4.GuestsInParkHistory); i++) @@ -2322,17 +2322,17 @@ namespace OpenRCT2::RCT1 gameState.park.staffSecurityColour = RCT1::GetColour(_s4.SecurityGuardColour); // Flags - gameState.park.Flags = _s4.ParkFlags; - gameState.park.Flags &= ~PARK_FLAGS_ANTI_CHEAT_DEPRECATED; - gameState.park.Flags |= PARK_FLAGS_RCT1_INTEREST; + gameState.park.flags = _s4.ParkFlags; + gameState.park.flags &= ~PARK_FLAGS_ANTI_CHEAT_DEPRECATED; + gameState.park.flags |= PARK_FLAGS_RCT1_INTEREST; // Loopy Landscape parks can set a flag to lock the entry price to free. // If this flag is not set, the player can ask money for both rides and entry. if (!(_s4.ParkFlags & RCT1_PARK_FLAGS_PARK_ENTRY_LOCKED_AT_FREE)) { - gameState.park.Flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; } - gameState.park.Size = _s4.ParkSize; + gameState.park.size = _s4.ParkSize; gameState.park.totalRideValueForMoney = _s4.TotalRideValueForMoney; gameState.park.samePriceThroughoutPark = 0; if (_gameVersion == FILE_VERSION_RCT1_LL) @@ -2452,7 +2452,7 @@ namespace OpenRCT2::RCT1 if (_isScenario && !parkName.empty()) { auto& park = getGameState().park; - park.Name = std::move(parkName); + park.name = std::move(parkName); } } @@ -2545,10 +2545,10 @@ namespace OpenRCT2::RCT1 void FixEntrancePositions(GameState_t& gameState) { - gameState.park.Entrances.clear(); + gameState.park.entrances.clear(); TileElementIterator it; TileElementIteratorBegin(&it); - while (TileElementIteratorNext(&it) && gameState.park.Entrances.size() < Limits::kMaxParkEntrances) + while (TileElementIteratorNext(&it) && gameState.park.entrances.size() < Limits::kMaxParkEntrances) { TileElement* element = it.element; @@ -2560,7 +2560,7 @@ namespace OpenRCT2::RCT1 continue; CoordsXYZD entrance = { TileCoordsXY(it.x, it.y).ToCoordsXY(), element->GetBaseZ(), element->GetDirection() }; - gameState.park.Entrances.push_back(entrance); + gameState.park.entrances.push_back(entrance); } } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 54764337b4..d7e8292981 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -382,18 +382,18 @@ namespace OpenRCT2::RCT2 gameState.initialCash = ToMoney64(_s6.InitialCash); gameState.park.bankLoan = ToMoney64(_s6.CurrentLoan); - gameState.park.Flags = _s6.ParkFlags & ~PARK_FLAGS_NO_MONEY_SCENARIO; + gameState.park.flags = _s6.ParkFlags & ~PARK_FLAGS_NO_MONEY_SCENARIO; // RCT2 used a different flag for `no money` when the park is a scenario if (_s6.Header.Type == S6_TYPE_SCENARIO) { if (_s6.ParkFlags & PARK_FLAGS_NO_MONEY_SCENARIO) - gameState.park.Flags |= PARK_FLAGS_NO_MONEY; + gameState.park.flags |= PARK_FLAGS_NO_MONEY; else - gameState.park.Flags &= ~PARK_FLAGS_NO_MONEY; + gameState.park.flags &= ~PARK_FLAGS_NO_MONEY; } - gameState.park.EntranceFee = _s6.ParkEntranceFee; + gameState.park.entranceFee = _s6.ParkEntranceFee; // rct1_park_entranceX // rct1_park_entrance_y // Pad013573EE @@ -424,14 +424,14 @@ namespace OpenRCT2::RCT2 gameState.park.staffMechanicColour = _s6.MechanicColour; gameState.park.staffSecurityColour = _s6.SecurityColour; - gameState.park.Rating = _s6.ParkRating; + gameState.park.rating = _s6.ParkRating; Park::ResetHistories(gameState); for (size_t i = 0; i < std::size(_s6.ParkRatingHistory); i++) { if (_s6.ParkRatingHistory[i] != kRCT12ParkHistoryUndefined) { - gameState.park.RatingHistory[i] = _s6.ParkRatingHistory[i] * kRCT12ParkRatingHistoryFactor; + gameState.park.ratingHistory[i] = _s6.ParkRatingHistory[i] * kRCT12ParkRatingHistoryFactor; } } for (size_t i = 0; i < std::size(_s6.GuestsInParkHistory); i++) @@ -461,7 +461,7 @@ namespace OpenRCT2::RCT2 gameState.researchExpectedDay = _s6.NextResearchExpectedDay; gameState.researchExpectedMonth = _s6.NextResearchExpectedMonth; gameState.guestInitialHappiness = _s6.GuestInitialHappiness; - gameState.park.Size = _s6.ParkSize; + gameState.park.size = _s6.ParkSize; gameState.park.guestGenerationProbability = _s6.GuestGenerationProbability; gameState.park.totalRideValueForMoney = _s6.TotalRideValueForMoney; gameState.park.maxBankLoan = ToMoney64(_s6.MaximumLoan); @@ -486,13 +486,13 @@ namespace OpenRCT2::RCT2 gameState.park.weeklyProfitAverageDivisor = _s6.WeeklyProfitAverageDivisor; // Pad0135833A - gameState.park.Value = ToMoney64(_s6.ParkValue); + gameState.park.value = ToMoney64(_s6.ParkValue); for (size_t i = 0; i < Limits::kFinanceGraphSize; i++) { gameState.park.cashHistory[i] = ToMoney64(_s6.BalanceHistory[i]); gameState.park.weeklyProfitHistory[i] = ToMoney64(_s6.WeeklyProfitHistory[i]); - gameState.park.ValueHistory[i] = ToMoney64(_s6.ParkValueHistory[i]); + gameState.park.valueHistory[i] = ToMoney64(_s6.ParkValueHistory[i]); } gameState.scenarioCompletedCompanyValue = RCT12CompletedCompanyValueToOpenRCT2(_s6.CompletedCompanyValue); @@ -525,7 +525,7 @@ namespace OpenRCT2::RCT2 gameState.scenarioCompletedBy = std::string_view(_s6.ScenarioCompletedName, sizeof(_s6.ScenarioCompletedName)); gameState.park.cash = ToMoney64(DECRYPT_MONEY(_s6.Cash)); // Pad013587FC - gameState.park.RatingCasualtyPenalty = _s6.ParkRatingCasualtyPenalty; + gameState.park.ratingCasualtyPenalty = _s6.ParkRatingCasualtyPenalty; gameState.mapSize = { _s6.MapSize, _s6.MapSize }; gameState.park.samePriceThroughoutPark = _s6.SamePriceThroughout | (static_cast(_s6.SamePriceThroughoutExtended) << 32); @@ -538,7 +538,7 @@ namespace OpenRCT2::RCT2 gameState.park.bankLoanInterestRate = _s6.CurrentInterestRate; // Pad0135934B // Preserve compatibility with vanilla RCT2's save format. - gameState.park.Entrances.clear(); + gameState.park.entrances.clear(); for (uint8_t i = 0; i < Limits::kMaxParkEntrances; i++) { if (_s6.ParkEntranceX[i] != kLocationNull) @@ -548,7 +548,7 @@ namespace OpenRCT2::RCT2 entrance.y = _s6.ParkEntranceY[i]; entrance.z = _s6.ParkEntranceZ[i]; entrance.direction = _s6.ParkEntranceDirection[i]; - gameState.park.Entrances.push_back(entrance); + gameState.park.entrances.push_back(entrance); } } if (_s6.Header.Type == S6_TYPE_SCENARIO) @@ -614,7 +614,7 @@ namespace OpenRCT2::RCT2 ConvertScenarioStringsToUTF8(gameState); DetermineRideEntranceAndExitLocations(); - gameState.park.Name = GetUserString(_s6.ParkName); + gameState.park.name = GetUserString(_s6.ParkName); if (_isScenario) { diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 90da1c2975..201b0214aa 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5355,7 +5355,7 @@ bool Ride::isRide() const money64 RideGetPrice(const Ride& ride) { - if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) + if (getGameState().park.flags & PARK_FLAGS_NO_MONEY) return 0; if (ride.isRide()) { diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index c081a58642..bea573dd9f 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -1917,8 +1917,8 @@ static bool TrackDesignPlacePreview( _trackDesignDrawingPreview = true; uint8_t backup_rotation = _currentTrackPieceDirection; - uint32_t backup_park_flags = gameState.park.Flags; - gameState.park.Flags &= ~PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; + uint32_t backup_park_flags = gameState.park.flags; + gameState.park.flags &= ~PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; auto mapSize = TileCoordsXY{ gameState.mapSize.x * 16, gameState.mapSize.y * 16 }; _currentTrackPieceDirection = 0; @@ -1942,7 +1942,7 @@ static bool TrackDesignPlacePreview( auto res = TrackDesignPlaceVirtual( tds, td, TrackPlaceOperation::placeTrackPreview, placeScenery, *ride, { mapSize.x, mapSize.y, z, _currentTrackPieceDirection }); - gameState.park.Flags = backup_park_flags; + gameState.park.flags = backup_park_flags; if (res.Error == GameActions::Status::Ok) { diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 07c5a61bc9..a50785bf8e 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -4572,9 +4572,9 @@ static void ride_train_crash(Ride& ride, uint16_t numFatalities) } auto& gameState = getGameState(); - if (gameState.park.RatingCasualtyPenalty < 500) + if (gameState.park.ratingCasualtyPenalty < 500) { - gameState.park.RatingCasualtyPenalty += 200; + gameState.park.ratingCasualtyPenalty += 200; } } } diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 2bf2de0d42..545713fcfc 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -103,8 +103,8 @@ void ScenarioReset(GameState_t& gameState) News::InitQueue(gameState); - gameState.park.Rating = Park::CalculateParkRating(); - gameState.park.Value = Park::CalculateParkValue(); + gameState.park.rating = Park::CalculateParkRating(); + gameState.park.value = Park::CalculateParkValue(); gameState.park.companyValue = Park::CalculateCompanyValue(); gameState.park.historicalProfit = gameState.initialCash - gameState.park.bankLoan; gameState.park.cash = gameState.initialCash; @@ -113,14 +113,14 @@ void ScenarioReset(GameState_t& gameState) if (auto* textObject = objManager.GetLoadedObject(0); textObject != nullptr) { gameState.scenarioName = textObject->GetScenarioName(); - gameState.park.Name = textObject->GetParkName(); + gameState.park.name = textObject->GetParkName(); gameState.scenarioDetails = textObject->GetScenarioDetails(); } // Set the last saved game path auto& env = GetContext()->GetPlatformEnvironment(); auto savePath = env.GetDirectoryPath(DirBase::user, DirId::saves); - gScenarioSavePath = Path::Combine(savePath, gameState.park.Name + u8".park"); + gScenarioSavePath = Path::Combine(savePath, gameState.park.name + u8".park"); gameState.park.currentExpenditure = 0; gameState.park.currentProfit = 0; @@ -129,7 +129,7 @@ void ScenarioReset(GameState_t& gameState) gameState.park.totalAdmissions = 0; gameState.park.totalIncomeFromAdmissions = 0; - gameState.park.Flags &= ~PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; + gameState.park.flags &= ~PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; gameState.scenarioCompletedCompanyValue = kMoney64Undefined; gameState.scenarioCompletedBy = "?"; @@ -151,16 +151,16 @@ void ScenarioReset(GameState_t& gameState) } gameState.park.marketingCampaigns.clear(); - gameState.park.RatingCasualtyPenalty = 0; + gameState.park.ratingCasualtyPenalty = 0; // Open park with free entry when there is no money - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) { - gameState.park.Flags |= PARK_FLAGS_PARK_OPEN; - gameState.park.EntranceFee = 0; + gameState.park.flags |= PARK_FLAGS_PARK_OPEN; + gameState.park.entranceFee = 0; } - gameState.park.Flags |= PARK_FLAGS_SPRITES_INITIALISED; + gameState.park.flags |= PARK_FLAGS_SPRITES_INITIALISED; gGamePaused = false; } @@ -199,7 +199,7 @@ void ScenarioSuccess(GameState_t& gameState) if (ScenarioRepositoryTryRecordHighscore(gameState.scenarioFileName.c_str(), companyValue, nullptr)) { // Allow name entry - gameState.park.Flags |= PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; + gameState.park.flags |= PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; gameState.scenarioCompanyValueRecord = companyValue; } ScenarioEnd(); @@ -215,7 +215,7 @@ void ScenarioSuccessSubmitName(GameState_t& gameState, const char* name) { gameState.scenarioCompletedBy = name; } - gameState.park.Flags &= ~PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; + gameState.park.flags &= ~PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT; } /** @@ -227,11 +227,11 @@ static void ScenarioCheckEntranceFeeTooHigh() const auto& gameState = getGameState(); const auto max_fee = AddClamp(gameState.park.totalRideValueForMoney, gameState.park.totalRideValueForMoney / 2); - if ((gameState.park.Flags & PARK_FLAGS_PARK_OPEN) && Park::GetEntranceFee() > max_fee) + if ((gameState.park.flags & PARK_FLAGS_PARK_OPEN) && Park::GetEntranceFee() > max_fee) { - if (!gameState.park.Entrances.empty()) + if (!gameState.park.entrances.empty()) { - const auto& entrance = gameState.park.Entrances[0]; + const auto& entrance = gameState.park.entrances[0]; auto x = entrance.x + 16; auto y = entrance.y + 16; @@ -301,8 +301,8 @@ static void ScenarioDayUpdate(GameState_t& gameState) } // Lower the casualty penalty - uint16_t casualtyPenaltyModifier = (gameState.park.Flags & PARK_FLAGS_NO_MONEY) ? 40 : 7; - gameState.park.RatingCasualtyPenalty = std::max(0, gameState.park.RatingCasualtyPenalty - casualtyPenaltyModifier); + uint16_t casualtyPenaltyModifier = (gameState.park.flags & PARK_FLAGS_NO_MONEY) ? 40 : 7; + gameState.park.ratingCasualtyPenalty = std::max(0, gameState.park.ratingCasualtyPenalty - casualtyPenaltyModifier); auto intent = Intent(INTENT_ACTION_UPDATE_DATE); ContextBroadcastIntent(&intent); @@ -593,7 +593,7 @@ ResultWithMessage ScenarioPrepareForSave(GameState_t& gameState) } if (gameState.scenarioObjective.Type == OBJECTIVE_GUESTS_AND_RATING) - gameState.park.Flags |= PARK_FLAGS_PARK_OPEN; + gameState.park.flags |= PARK_FLAGS_PARK_OPEN; ScenarioReset(gameState); @@ -602,7 +602,7 @@ ResultWithMessage ScenarioPrepareForSave(GameState_t& gameState) ObjectiveStatus Objective::CheckGuestsBy() const { - auto parkRating = getGameState().park.Rating; + auto parkRating = getGameState().park.rating; int32_t currentMonthYear = GetDate().GetMonthsElapsed(); if (currentMonthYear == MONTH_COUNT * Year || AllowEarlyCompletion()) @@ -625,7 +625,7 @@ ObjectiveStatus Objective::CheckParkValueBy() const { int32_t currentMonthYear = GetDate().GetMonthsElapsed(); money64 objectiveParkValue = Currency; - money64 parkValue = getGameState().park.Value; + money64 parkValue = getGameState().park.value; if (currentMonthYear == MONTH_COUNT * Year || AllowEarlyCompletion()) { @@ -683,7 +683,7 @@ ObjectiveStatus Objective::Check10RollerCoasters() const ObjectiveStatus Objective::CheckGuestsAndRating() const { auto& gameState = getGameState(); - if (gameState.park.Rating < 700 && GetDate().GetMonthsElapsed() >= 1) + if (gameState.park.rating < 700 && GetDate().GetMonthsElapsed() >= 1) { gameState.scenarioParkRatingWarningDays++; if (gameState.scenarioParkRatingWarningDays == 1) @@ -717,7 +717,7 @@ ObjectiveStatus Objective::CheckGuestsAndRating() const else if (gameState.scenarioParkRatingWarningDays == 29) { News::AddItemToQueue(News::ItemType::graph, STR_PARK_HAS_BEEN_CLOSED_DOWN, 0, {}); - gameState.park.Flags &= ~PARK_FLAGS_PARK_OPEN; + gameState.park.flags &= ~PARK_FLAGS_PARK_OPEN; gameState.guestInitialHappiness = 50; return ObjectiveStatus::Failure; } @@ -727,7 +727,7 @@ ObjectiveStatus Objective::CheckGuestsAndRating() const gameState.scenarioParkRatingWarningDays = 0; } - if (gameState.park.Rating >= 700) + if (gameState.park.rating >= 700) if (gameState.park.numGuestsInPark >= NumGuests) return ObjectiveStatus::Success; @@ -812,7 +812,7 @@ ObjectiveStatus Objective::CheckFinish5RollerCoasters() const ObjectiveStatus Objective::CheckRepayLoanAndParkValue() const { const auto& gameState = getGameState(); - money64 parkValue = gameState.park.Value; + money64 parkValue = gameState.park.value; money64 currentLoan = gameState.park.bankLoan; if (currentLoan <= 0 && parkValue >= Currency) diff --git a/src/openrct2/scripting/bindings/world/ScPark.cpp b/src/openrct2/scripting/bindings/world/ScPark.cpp index a2da46c49b..e0d1065956 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.cpp +++ b/src/openrct2/scripting/bindings/world/ScPark.cpp @@ -69,7 +69,7 @@ namespace OpenRCT2::Scripting int32_t ScPark::rating_get() const { - return getGameState().park.Rating; + return getGameState().park.rating; } void ScPark::rating_set(int32_t value) { @@ -77,9 +77,9 @@ namespace OpenRCT2::Scripting auto valueClamped = std::min(std::max(0, value), 999); auto& gameState = getGameState(); - if (gameState.park.Rating != valueClamped) + if (gameState.park.rating != valueClamped) { - gameState.park.Rating = std::min(std::max(0, value), 999); + gameState.park.rating = std::min(std::max(0, value), 999); auto intent = Intent(INTENT_ACTION_UPDATE_PARK_RATING); ContextBroadcastIntent(&intent); } @@ -122,16 +122,16 @@ namespace OpenRCT2::Scripting money64 ScPark::entranceFee_get() const { - return getGameState().park.EntranceFee; + return getGameState().park.entranceFee; } void ScPark::entranceFee_set(money64 value) { ThrowIfGameStateNotMutable(); auto& gameState = getGameState(); - if (gameState.park.EntranceFee != value) + if (gameState.park.entranceFee != value) { - gameState.park.EntranceFee = value; + gameState.park.entranceFee = value; auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByClass(WindowClass::ParkInformation); } @@ -181,16 +181,16 @@ namespace OpenRCT2::Scripting money64 ScPark::value_get() const { - return getGameState().park.Value; + return getGameState().park.value; } void ScPark::value_set(money64 value) { ThrowIfGameStateNotMutable(); auto& gameState = getGameState(); - if (gameState.park.Value != value) + if (gameState.park.value != value) { - gameState.park.Value = value; + gameState.park.value = value; auto intent = Intent(INTENT_ACTION_UPDATE_CASH); ContextBroadcastIntent(&intent); } @@ -274,31 +274,31 @@ namespace OpenRCT2::Scripting int16_t ScPark::casualtyPenalty_get() const { - return getGameState().park.RatingCasualtyPenalty; + return getGameState().park.ratingCasualtyPenalty; } void ScPark::casualtyPenalty_set(int16_t value) { ThrowIfGameStateNotMutable(); - getGameState().park.RatingCasualtyPenalty = value; + getGameState().park.ratingCasualtyPenalty = value; } uint16_t ScPark::parkSize_get() const { - return getGameState().park.Size; + return getGameState().park.size; } std::string ScPark::name_get() const { - return getGameState().park.Name; + return getGameState().park.name; } void ScPark::name_set(std::string value) { ThrowIfGameStateNotMutable(); auto& park = getGameState().park; - if (park.Name != value) + if (park.name != value) { - park.Name = std::move(value); + park.name = std::move(value); GfxInvalidateScreen(); } } @@ -306,7 +306,7 @@ namespace OpenRCT2::Scripting bool ScPark::getFlag(const std::string& key) const { auto mask = ParkFlagMap[key]; - return (getGameState().park.Flags & mask) != 0; + return (getGameState().park.flags & mask) != 0; } void ScPark::setFlag(const std::string& key, bool value) @@ -315,9 +315,9 @@ namespace OpenRCT2::Scripting auto mask = ParkFlagMap[key]; auto& gameState = getGameState(); if (value) - gameState.park.Flags |= mask; + gameState.park.flags |= mask; else - gameState.park.Flags &= ~mask; + gameState.park.flags &= ~mask; GfxInvalidateScreen(); } diff --git a/src/openrct2/world/ConstructionClearance.cpp b/src/openrct2/world/ConstructionClearance.cpp index 4d9132edd0..c194ccb46f 100644 --- a/src/openrct2/world/ConstructionClearance.cpp +++ b/src/openrct2/world/ConstructionClearance.cpp @@ -45,13 +45,13 @@ static int32_t MapPlaceClearFunc( auto* scenery = (*tile_element)->AsSmallScenery()->GetEntry(); auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL) + if (gameState.park.flags & PARK_FLAGS_FORBID_TREE_REMOVAL) { if (scenery != nullptr && scenery->HasFlag(SMALL_SCENERY_FLAG_IS_TREE)) return 1; } - if (!(gameState.park.Flags & PARK_FLAGS_NO_MONEY) && scenery != nullptr) + if (!(gameState.park.flags & PARK_FLAGS_NO_MONEY) && scenery != nullptr) *price += scenery->removal_price; if (flags & GAME_COMMAND_FLAG_GHOST) @@ -198,7 +198,7 @@ GameActions::Result MapCanConstructWithClearAt( } } - if (getGameState().park.Flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION && !isTree) + if (getGameState().park.flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION && !isTree) { const auto heightFromGround = pos.clearanceZ - tileElement->GetBaseZ(); diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index f23bba538b..8a7dccb07b 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -69,7 +69,7 @@ void ParkEntranceRemoveGhost() int32_t ParkEntranceGetIndex(const CoordsXYZ& entrancePos) { int32_t i = 0; - for (const auto& entrance : getGameState().park.Entrances) + for (const auto& entrance : getGameState().park.entrances) { if (entrancePos == entrance) { @@ -82,7 +82,7 @@ int32_t ParkEntranceGetIndex(const CoordsXYZ& entrancePos) void ParkEntranceReset() { - getGameState().park.Entrances.clear(); + getGameState().park.entrances.clear(); } void RideEntranceExitPlaceProvisionalGhost() @@ -213,17 +213,17 @@ void ParkEntranceFixLocations(void) { auto& gameState = getGameState(); // Fix ParkEntrance locations for which the tile_element no longer exists - gameState.park.Entrances.erase( + gameState.park.entrances.erase( std::remove_if( - gameState.park.Entrances.begin(), gameState.park.Entrances.end(), + gameState.park.entrances.begin(), gameState.park.entrances.end(), [](const auto& entrance) { return MapGetParkEntranceElementAt(entrance, false) == nullptr; }), - gameState.park.Entrances.end()); + gameState.park.entrances.end()); } void ParkEntranceUpdateLocations() { auto& gameState = getGameState(); - gameState.park.Entrances.clear(); + gameState.park.entrances.clear(); TileElementIterator it; TileElementIteratorBegin(&it); while (TileElementIteratorNext(&it)) @@ -233,7 +233,7 @@ void ParkEntranceUpdateLocations() && entranceElement->GetSequenceIndex() == 0 && !entranceElement->IsGhost()) { auto entrance = TileCoordsXYZD(it.x, it.y, it.element->BaseHeight, it.element->GetDirection()).ToCoordsXYZD(); - gameState.park.Entrances.push_back(entrance); + gameState.park.entrances.push_back(entrance); } } } diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 4eb6e09ec1..f56a4f9b15 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -2306,7 +2306,7 @@ void ShiftMap(const TileCoordsXY& amount) for (auto& spawn : gameState.peepSpawns) shiftIfNotNull(spawn, amountToMove); - for (auto& entrance : gameState.park.Entrances) + for (auto& entrance : gameState.park.entrances) shiftIfNotNull(entrance, amountToMove); // Entities diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 158d716d19..cf02a13123 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -85,7 +85,7 @@ namespace OpenRCT2::Park static money64 calculateTotalRideValueForMoney() { money64 totalRideValue = 0; - bool ridePricesUnlocked = RidePricesUnlocked() && !(getGameState().park.Flags & PARK_FLAGS_NO_MONEY); + bool ridePricesUnlocked = RidePricesUnlocked() && !(getGameState().park.flags & PARK_FLAGS_NO_MONEY); for (auto& ride : GetRideManager()) { if (ride.status != RideStatus::open) @@ -132,7 +132,7 @@ namespace OpenRCT2::Park suggestedMaxGuests += ride.getRideTypeDescriptor().BonusValue; // If difficult guest generation, extra guests are available for good rides - if (gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) + if (gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) { if (!(ride.lifecycleFlags & RIDE_LIFECYCLE_TESTED)) continue; @@ -150,7 +150,7 @@ namespace OpenRCT2::Park } } - if (gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) + if (gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) { suggestedMaxGuests = std::min(suggestedMaxGuests, 1000); suggestedMaxGuests += difficultGenerationBonus; @@ -180,7 +180,7 @@ namespace OpenRCT2::Park auto& gameState = getGameState(); // Begin with 50 + park rating - uint32_t probability = 50 + std::clamp(gameState.park.Rating - 200, 0, 650); + uint32_t probability = 50 + std::clamp(gameState.park.rating - 200, 0, 650); // The more guests, the lower the chance of a new one uint32_t numGuests = gameState.park.numGuestsInPark + gameState.park.numGuestsHeadingForPark; @@ -188,7 +188,7 @@ namespace OpenRCT2::Park { probability /= 4; // Even lower for difficult guest generation - if (gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) + if (gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) { probability /= 4; } @@ -234,7 +234,7 @@ namespace OpenRCT2::Park // Generate a new guest for some probability if (static_cast(ScenarioRand() & 0xFFFF) < gameState.park.guestGenerationProbability) { - bool difficultGeneration = (gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0; + bool difficultGeneration = (gameState.park.flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0; if (!difficultGeneration || gameState.park.suggestedGuestMaximum + 150 >= gameState.park.numGuestsInPark) { GenerateGuest(); @@ -276,7 +276,7 @@ namespace OpenRCT2::Park void Initialise(GameState_t& gameState) { - gameState.park.Name = LanguageGetString(STR_UNNAMED_PARK); + gameState.park.name = LanguageGetString(STR_UNNAMED_PARK); gameState.pluginStorage = {}; gameState.park.staffHandymanColour = COLOUR_BRIGHT_RED; gameState.park.staffMechanicColour = COLOUR_LIGHT_BLUE; @@ -285,7 +285,7 @@ namespace OpenRCT2::Park gameState.park.numGuestsInParkLastWeek = 0; gameState.park.numGuestsHeadingForPark = 0; gameState.park.guestChangeModifier = 0; - gameState.park.Rating = 0; + gameState.park.rating = 0; gameState.park.guestGenerationProbability = 0; gameState.park.totalRideValueForMoney = 0; gameState.park.suggestedGuestMaximum = 0; @@ -299,7 +299,7 @@ namespace OpenRCT2::Park SetAllSceneryItemsInvented(); - gameState.park.EntranceFee = 10.00_GBP; + gameState.park.entranceFee = 10.00_GBP; gameState.peepSpawns.clear(); ParkEntranceReset(); @@ -318,7 +318,7 @@ namespace OpenRCT2::Park gameState.scenarioObjective.NumGuests = 1000; gameState.landPrice = 90.00_GBP; gameState.constructionRightsPrice = 40.00_GBP; - gameState.park.Flags = PARK_FLAGS_NO_MONEY | PARK_FLAGS_SHOW_REAL_GUEST_NAMES; + gameState.park.flags = PARK_FLAGS_NO_MONEY | PARK_FLAGS_SHOW_REAL_GUEST_NAMES; ResetHistories(gameState); FinanceResetHistory(); AwardReset(); @@ -343,8 +343,8 @@ namespace OpenRCT2::Park // Every ~13 seconds if (currentTicks % 512 == 0) { - gameState.park.Rating = CalculateParkRating(); - gameState.park.Value = Park::CalculateParkValue(); + gameState.park.rating = CalculateParkRating(); + gameState.park.value = Park::CalculateParkValue(); gameState.park.companyValue = CalculateCompanyValue(); gameState.park.totalRideValueForMoney = calculateTotalRideValueForMoney(); gameState.park.suggestedGuestMaximum = calculateSuggestedMaxGuests(); @@ -358,7 +358,7 @@ namespace OpenRCT2::Park // Every ~102 seconds if (currentTicks % 4096 == 0) { - gameState.park.Size = CalculateParkSize(); + gameState.park.size = CalculateParkSize(); windowMgr->InvalidateByClass(WindowClass::ParkInformation); } @@ -382,9 +382,9 @@ namespace OpenRCT2::Park } while (TileElementIteratorNext(&it)); auto& gameState = getGameState(); - if (tiles != gameState.park.Size) + if (tiles != gameState.park.size) { - gameState.park.Size = tiles; + gameState.park.size = tiles; auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByClass(WindowClass::ParkInformation); } @@ -402,7 +402,7 @@ namespace OpenRCT2::Park } int32_t result = 1150; - if (gameState.park.Flags & PARK_FLAGS_DIFFICULT_PARK_RATING) + if (gameState.park.flags & PARK_FLAGS_DIFFICULT_PARK_RATING) { result = 1050; } @@ -505,7 +505,7 @@ namespace OpenRCT2::Park result -= 600 - (4 * (150 - std::min(150, litterCount))); } - result -= gameState.park.RatingCasualtyPenalty; + result -= gameState.park.ratingCasualtyPenalty; result = std::clamp(result, 0, 999); return result; } @@ -529,7 +529,7 @@ namespace OpenRCT2::Park { const auto& gameState = getGameState(); - auto result = gameState.park.Value - gameState.park.bankLoan; + auto result = gameState.park.value - gameState.park.bankLoan; // Clamp addition to prevent overflow result = AddClamp(result, FinanceGetCurrentCash()); @@ -584,7 +584,7 @@ namespace OpenRCT2::Park void ResetHistories(GameState_t& gameState) { std::fill( - std::begin(gameState.park.RatingHistory), std::end(gameState.park.RatingHistory), kParkRatingHistoryUndefined); + std::begin(gameState.park.ratingHistory), std::end(gameState.park.ratingHistory), kParkRatingHistoryUndefined); std::fill( std::begin(gameState.park.guestsInParkHistory), std::end(gameState.park.guestsInParkHistory), kGuestsInParkHistoryUndefined); @@ -607,8 +607,8 @@ namespace OpenRCT2::Park gameState.park.numGuestsInParkLastWeek = gameState.park.numGuestsInPark; // Update park rating, guests in park and current cash history - constexpr auto ratingHistorySize = std::extent_v; - HistoryPushRecord(gameState.park.RatingHistory, gameState.park.Rating); + constexpr auto ratingHistorySize = std::extent_v; + HistoryPushRecord(gameState.park.ratingHistory, gameState.park.rating); constexpr auto numGuestsHistorySize = std::extent_v; HistoryPushRecord(gameState.park.guestsInParkHistory, gameState.park.numGuestsInPark); @@ -629,7 +629,7 @@ namespace OpenRCT2::Park // Update park value history constexpr auto parkValueHistorySize = std::extent_v; - HistoryPushRecord(gameState.park.ValueHistory, gameState.park.Value); + HistoryPushRecord(gameState.park.valueHistory, gameState.park.value); // Invalidate relevant windows auto intent = Intent(INTENT_ACTION_UPDATE_GUEST_COUNT); @@ -643,9 +643,9 @@ namespace OpenRCT2::Park uint32_t UpdateSize(GameState_t& gameState) { auto tiles = CalculateParkSize(); - if (tiles != gameState.park.Size) + if (tiles != gameState.park.size) { - gameState.park.Size = tiles; + gameState.park.size = tiles; auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByClass(WindowClass::ParkInformation); @@ -742,7 +742,7 @@ namespace OpenRCT2::Park { auto& gameState = getGameState(); gameState.cheats.forcedParkRating = rating; - gameState.park.Rating = CalculateParkRating(); + gameState.park.rating = CalculateParkRating(); auto intent = Intent(INTENT_ACTION_UPDATE_PARK_RATING); ContextBroadcastIntent(&intent); @@ -756,7 +756,7 @@ namespace OpenRCT2::Park money64 GetEntranceFee() { const auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) + if (gameState.park.flags & PARK_FLAGS_NO_MONEY) { return 0; } @@ -764,17 +764,17 @@ namespace OpenRCT2::Park { return 0; } - return gameState.park.EntranceFee; + return gameState.park.entranceFee; } bool RidePricesUnlocked() { const auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_UNLOCK_ALL_PRICES) + if (gameState.park.flags & PARK_FLAGS_UNLOCK_ALL_PRICES) { return true; } - if (gameState.park.Flags & PARK_FLAGS_PARK_FREE_ENTRY) + if (gameState.park.flags & PARK_FLAGS_PARK_FREE_ENTRY) { return true; } @@ -784,11 +784,11 @@ namespace OpenRCT2::Park bool EntranceFeeUnlocked() { const auto& gameState = getGameState(); - if (gameState.park.Flags & PARK_FLAGS_UNLOCK_ALL_PRICES) + if (gameState.park.flags & PARK_FLAGS_UNLOCK_ALL_PRICES) { return true; } - if (!(gameState.park.Flags & PARK_FLAGS_PARK_FREE_ENTRY)) + if (!(gameState.park.flags & PARK_FLAGS_PARK_FREE_ENTRY)) { return true; } @@ -797,6 +797,6 @@ namespace OpenRCT2::Park bool IsOpen(const ParkData& park) { - return (park.Flags & PARK_FLAGS_PARK_OPEN) != 0; + return (park.flags & PARK_FLAGS_PARK_OPEN) != 0; } } // namespace OpenRCT2::Park diff --git a/src/openrct2/world/ParkData.h b/src/openrct2/world/ParkData.h index 95b6cc7b13..9a16cf49eb 100644 --- a/src/openrct2/world/ParkData.h +++ b/src/openrct2/world/ParkData.h @@ -59,16 +59,16 @@ namespace OpenRCT2::Park { struct ParkData final { - std::string Name; - uint64_t Flags; - uint16_t Rating; - uint16_t RatingHistory[kParkRatingHistorySize]; - int16_t RatingCasualtyPenalty; - money64 EntranceFee; - std::vector Entrances; - uint32_t Size; - money64 Value; - money64 ValueHistory[kFinanceHistorySize]; + std::string name; + uint64_t flags; + uint16_t rating; + uint16_t ratingHistory[kParkRatingHistorySize]; + int16_t ratingCasualtyPenalty; + money64 entranceFee; + std::vector entrances; + uint32_t size; + money64 value; + money64 valueHistory[kFinanceHistorySize]; money64 cash; money64 cashHistory[kFinanceHistorySize]; diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index d4bd3e9c99..ad5b22b9ab 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -104,7 +104,7 @@ TEST_F(PlayTests, SecondGuestInQueueShouldNotRideIfNoFunds) // Open park for free but charging for rides execute(ParkParameter::Open); execute(0); - gameState.park.Flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; // Find ferris wheel auto rideManager = GetRideManager(); @@ -164,7 +164,7 @@ TEST_F(PlayTests, CarRideWithOneCarOnlyAcceptsTwoGuests) // Open park for free but charging for rides execute(ParkParameter::Open); execute(0); - gameState.park.Flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; + gameState.park.flags |= PARK_FLAGS_UNLOCK_ALL_PRICES; // Find car ride auto rideManager = GetRideManager();