mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Extract ParkData::IsOpen member into Park namespace

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-13 20:05:45 +02:00
parent 3f9352b511
commit 24fa5b0794
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/Park.cpp
View File

@@ -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<StringId>(STR_STRING);
ft.Add<const char*>(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<StringId>(getGameState().park.IsOpen() ? STR_PARK_OPEN : STR_PARK_CLOSED);
ft.Add<StringId>(Park::IsOpen(getGameState().park) ? STR_PARK_OPEN : STR_PARK_CLOSED);
auto* labelWidget = &widgets[WIDX_STATUS];
DrawTextEllipsised(

2
src/openrct2/actions/CheatSetAction.cpp
View File

@@ -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;

4
src/openrct2/world/Park.cpp
View File

@@ -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

3
src/openrct2/world/Park.h
View File

@@ -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();

2
src/openrct2/world/ParkData.h
View File

@@ -65,7 +65,5 @@ namespace OpenRCT2::Park
uint32_t Size;
money64 Value;
money64 ValueHistory[kFinanceHistorySize];
bool IsOpen() const;
};
} // namespace OpenRCT2::Park