diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 233d86cbdf..eef2830394 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -451,7 +451,7 @@ namespace OpenRCT2::Ui::Windows WindowDropdownShowText( { windowPos.x + widget.left, windowPos.y + widget.top }, widget.height() + 1, colours[1], 0, 2); - if (getGameState().park.IsOpen()) + if (Park::IsOpen(getGameState().park)) { gDropdownDefaultIndex = 0; Dropdown::SetChecked(1, true); @@ -512,7 +512,7 @@ namespace OpenRCT2::Ui::Windows ft.Add(STR_STRING); ft.Add(parkName); } - const bool parkIsOpen = gameState.park.IsOpen(); + const bool parkIsOpen = Park::IsOpen(gameState.park); widgets[WIDX_OPEN_OR_CLOSE].image = ImageId(parkIsOpen ? SPR_OPEN : SPR_CLOSED); const auto closeLightImage = SPR_G2_RCT1_CLOSE_BUTTON_0 + !parkIsOpen * 2 + widgetIsPressed(*this, WIDX_CLOSE_LIGHT); @@ -598,7 +598,7 @@ namespace OpenRCT2::Ui::Windows // Draw park closed / open label auto ft = Formatter(); - ft.Add(getGameState().park.IsOpen() ? STR_PARK_OPEN : STR_PARK_CLOSED); + ft.Add(Park::IsOpen(getGameState().park) ? STR_PARK_OPEN : STR_PARK_CLOSED); auto* labelWidget = &widgets[WIDX_STATUS]; DrawTextEllipsised( diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index fef2f047f3..15175bbb20 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -231,7 +231,7 @@ GameActions::Result CheatSetAction::Execute() const gameState.cheats.neverendingMarketing = _param1 != 0; break; case CheatType::OpenClosePark: - ParkSetOpen(!gameState.park.IsOpen()); + ParkSetOpen(!Park::IsOpen(gameState.park)); break; case CheatType::HaveFun: gameState.scenarioObjective.Type = OBJECTIVE_HAVE_FUN; diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 25367a7456..42d004b9f1 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -793,8 +793,8 @@ namespace OpenRCT2::Park return false; } - bool ParkData::IsOpen() const + bool IsOpen(const ParkData& park) { - return (Flags & PARK_FLAGS_PARK_OPEN) != 0; + return (park.Flags & PARK_FLAGS_PARK_OPEN) != 0; } } // namespace OpenRCT2::Park diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h index 003041fd08..36e0c5a19c 100644 --- a/src/openrct2/world/Park.h +++ b/src/openrct2/world/Park.h @@ -22,6 +22,8 @@ namespace OpenRCT2 namespace OpenRCT2::Park { + struct ParkData; + void Initialise(GameState_t& gameState); void Update(GameState_t& gameState, const Date& date); @@ -44,6 +46,7 @@ namespace OpenRCT2::Park uint8_t CalculateGuestInitialHappiness(uint8_t percentage); + bool IsOpen(const ParkData& park); void SetOpen(bool open); money64 GetEntranceFee(); diff --git a/src/openrct2/world/ParkData.h b/src/openrct2/world/ParkData.h index 25789f279e..88ebd3e30d 100644 --- a/src/openrct2/world/ParkData.h +++ b/src/openrct2/world/ParkData.h @@ -65,7 +65,5 @@ namespace OpenRCT2::Park uint32_t Size; money64 Value; money64 ValueHistory[kFinanceHistorySize]; - - bool IsOpen() const; }; } // namespace OpenRCT2::Park