From 5365e101961bfc33ecc74768967cf5fe109aae85 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 21 Aug 2025 21:04:16 +0200 Subject: [PATCH] Rename MaxBankLoanInterestRate to kMaxBankLoanInterestRate --- src/openrct2-ui/windows/EditorScenarioOptions.cpp | 4 ++-- src/openrct2/Editor.cpp | 2 +- src/openrct2/actions/ScenarioSetSettingAction.cpp | 2 +- src/openrct2/management/Finance.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 4dde67d849..a7d0700b15 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -1486,7 +1486,7 @@ namespace OpenRCT2::Ui::Windows Invalidate(); break; case WIDX_INTEREST_RATE_INCREASE: - if (gameState.park.bankLoanInterestRate < MaxBankLoanInterestRate) + if (gameState.park.bankLoanInterestRate < kMaxBankLoanInterestRate) { auto scenarioSetSetting = ScenarioSetSettingAction( ScenarioSetSetting::AnnualInterestRate, gameState.park.bankLoanInterestRate + 1); @@ -1501,7 +1501,7 @@ namespace OpenRCT2::Ui::Windows case WIDX_INTEREST_RATE_DECREASE: if (gameState.park.bankLoanInterestRate > 0) { - auto interest = std::min(MaxBankLoanInterestRate, gameState.park.bankLoanInterestRate - 1); + auto interest = std::min(kMaxBankLoanInterestRate, gameState.park.bankLoanInterestRate - 1); auto scenarioSetSetting = ScenarioSetSettingAction(ScenarioSetSetting::AnnualInterestRate, interest); GameActions::Execute(&scenarioSetSetting); } diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 309cfa0371..5e5f17bb4a 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -331,7 +331,7 @@ namespace OpenRCT2::Editor gameState.park.maxBankLoan = std::clamp(gameState.park.maxBankLoan, 0.00_GBP, 5000000.00_GBP); gameState.park.bankLoanInterestRate = std::clamp( - gameState.park.bankLoanInterestRate, 5, MaxBankLoanInterestRate); + gameState.park.bankLoanInterestRate, 5, kMaxBankLoanInterestRate); } ClimateReset(); diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index 701ccfa1a2..4f251c4b6d 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -99,7 +99,7 @@ GameActions::Result ScenarioSetSettingAction::Execute() const windowMgr->InvalidateByClass(WindowClass::Finances); break; case ScenarioSetSetting::AnnualInterestRate: - gameState.park.bankLoanInterestRate = std::clamp(_value, 0, MaxBankLoanInterestRate); + gameState.park.bankLoanInterestRate = std::clamp(_value, 0, kMaxBankLoanInterestRate); windowMgr->InvalidateByClass(WindowClass::Finances); break; case ScenarioSetSetting::ForbidMarketingCampaigns: diff --git a/src/openrct2/management/Finance.h b/src/openrct2/management/Finance.h index 6706ad19cf..9c356caa97 100644 --- a/src/openrct2/management/Finance.h +++ b/src/openrct2/management/Finance.h @@ -34,7 +34,7 @@ enum class ExpenditureType : int32_t constexpr uint8_t kExpenditureTableMonthCount = 16; constexpr uint8_t kFinanceHistorySize = 128; -constexpr uint8_t MaxBankLoanInterestRate = 255; +constexpr uint8_t kMaxBankLoanInterestRate = 255; extern const money64 research_cost_table[RESEARCH_FUNDING_COUNT];