From ceb94ed7722359dd26212e7e1c49ea87a15941b3 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 21 Aug 2025 21:05:11 +0200 Subject: [PATCH] Rename research_cost_table to kResearchCosts --- src/openrct2-ui/windows/Research.cpp | 2 +- src/openrct2/management/Finance.cpp | 6 +++--- src/openrct2/management/Finance.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index e6a0316bc6..430e12af78 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -580,7 +580,7 @@ namespace OpenRCT2::Ui::Windows int32_t currentResearchLevel = gameState.researchFundingLevel; auto ft = Formatter(); - ft.Add(research_cost_table[currentResearchLevel]); + ft.Add(kResearchCosts[currentResearchLevel]); DrawTextBasic( rt, w->windowPos + ScreenCoordsXY{ 10, w->widgets[WIDX_TAB_1].top + 60 }, STR_RESEARCH_COST_PER_MONTH, ft); } diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 59d041632d..f63baa09ab 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -30,7 +30,7 @@ using namespace OpenRCT2; // Monthly research funding costs -const money64 research_cost_table[RESEARCH_FUNDING_COUNT] = { +const money64 kResearchCosts[RESEARCH_FUNDING_COUNT] = { 0.00_GBP, // No funding 100.00_GBP, // Minimum funding 200.00_GBP, // Normal funding @@ -123,7 +123,7 @@ void FinancePayResearch() } const uint8_t level = gameState.researchFundingLevel; - FinancePayment(research_cost_table[level] / 4, ExpenditureType::research); + FinancePayment(kResearchCosts[level] / 4, ExpenditureType::research); } /** @@ -262,7 +262,7 @@ void FinanceUpdateDailyProfit() // Research costs uint8_t level = gameState.researchFundingLevel; - current_profit -= research_cost_table[level]; + current_profit -= kResearchCosts[level]; // Loan costs auto current_loan = gameState.park.bankLoan; diff --git a/src/openrct2/management/Finance.h b/src/openrct2/management/Finance.h index 9c356caa97..85321238c8 100644 --- a/src/openrct2/management/Finance.h +++ b/src/openrct2/management/Finance.h @@ -36,7 +36,7 @@ constexpr uint8_t kFinanceHistorySize = 128; constexpr uint8_t kMaxBankLoanInterestRate = 255; -extern const money64 research_cost_table[RESEARCH_FUNDING_COUNT]; +extern const money64 kResearchCosts[RESEARCH_FUNDING_COUNT]; bool FinanceCheckMoneyRequired(uint32_t flags); bool FinanceCheckAffordability(money64 cost, uint32_t flags);