mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Small cleanup

This commit is contained in:
ζeh Matt 2024-01-20 17:21:06 +02:00
parent c493e22b9b
commit 25c807edbd
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -433,13 +433,14 @@ private:
void FinancialMouseDown(WidgetIndex widgetIndex)
{
auto& gameState = GetGameState();
switch (widgetIndex)
{
case WIDX_INITIAL_CASH_INCREASE:
if (GetGameState().InitialCash < 1000000.00_GBP)
if (gameState.InitialCash < 1000000.00_GBP)
{
auto scenarioSetSetting = ScenarioSetSettingAction(
ScenarioSetSetting::InitialCash, GetGameState().InitialCash + 500.00_GBP);
ScenarioSetSetting::InitialCash, gameState.InitialCash + 500.00_GBP);
GameActions::Execute(&scenarioSetSetting);
}
else
@ -449,10 +450,10 @@ private:
Invalidate();
break;
case WIDX_INITIAL_CASH_DECREASE:
if (GetGameState().InitialCash > 0.00_GBP)
if (gameState.InitialCash > 0.00_GBP)
{
auto scenarioSetSetting = ScenarioSetSettingAction(
ScenarioSetSetting::InitialCash, GetGameState().InitialCash - 500.00_GBP);
ScenarioSetSetting::InitialCash, gameState.InitialCash - 500.00_GBP);
GameActions::Execute(&scenarioSetSetting);
}
else

5
src/openrct2/actions/ScenarioSetSettingAction.cpp
View File

@ -48,6 +48,7 @@ GameActions::Result ScenarioSetSettingAction::Query() const
GameActions::Result ScenarioSetSettingAction::Execute() const
{
auto& gameState = GetGameState();
switch (_setting)
{
case ScenarioSetSetting::NoMoney:
@ -82,8 +83,8 @@ GameActions::Result ScenarioSetSettingAction::Execute() const
}
break;
case ScenarioSetSetting::InitialCash:
GetGameState().InitialCash = std::clamp<money64>(_value, 0.00_GBP, 1000000.00_GBP);
GetGameState().Cash = GetGameState().InitialCash;
gameState.InitialCash = std::clamp<money64>(_value, 0.00_GBP, 1000000.00_GBP);
gameState.Cash = gameState.InitialCash;
WindowInvalidateByClass(WindowClass::Finances);
WindowInvalidateByClass(WindowClass::BottomToolbar);
break;

9
src/openrct2/management/Finance.cpp
View File

@ -213,6 +213,8 @@ void FinanceResetHistory()
*/
void FinanceInit()
{
auto& gameState = GetGameState();
// It only initialises the first month
for (uint32_t i = 0; i < static_cast<int32_t>(ExpenditureType::Count); i++)
{
@ -225,9 +227,9 @@ void FinanceInit()
gWeeklyProfitAverageDividend = 0;
gWeeklyProfitAverageDivisor = 0;
GetGameState().InitialCash = 10000.00_GBP; // Cheat detection
gameState.InitialCash = 10000.00_GBP; // Cheat detection
GetGameState().Cash = 10000.00_GBP;
gameState.Cash = 10000.00_GBP;
gBankLoan = 10000.00_GBP;
gMaxBankLoan = 20000.00_GBP;
@ -355,7 +357,8 @@ void FinanceShiftExpenditureTable()
*/
void FinanceResetCashToInitial()
{
GetGameState().Cash = GetGameState().InitialCash;
auto& gameState = GetGameState();
gameState.Cash = gameState.InitialCash;
}
/**

5
src/openrct2/scenario/Scenario.cpp
View File

@ -110,12 +110,13 @@ void ScenarioReset()
ScenerySetDefaultPlacementConfiguration();
News::InitQueue();
auto& gameState = GetGameState();
auto& park = GetContext()->GetGameState()->GetPark();
gParkRating = park.CalculateParkRating();
gParkValue = park.CalculateParkValue();
gCompanyValue = park.CalculateCompanyValue();
gHistoricalProfit = GetGameState().InitialCash - gBankLoan;
GetGameState().Cash = GetGameState().InitialCash;
gHistoricalProfit = gameState.InitialCash - gBankLoan;
gameState.Cash = gameState.InitialCash;
{
utf8 normalisedName[64];