From fc9e14caa84fce34f3b3e927bb77912c0d9ec4fc Mon Sep 17 00:00:00 2001 From: matheusvb3 <98937378+matheusvb3@users.noreply.github.com> Date: Sat, 22 Nov 2025 20:13:09 -0300 Subject: [PATCH] Remove unnecessary type specifiers from AddClamp calls --- src/openrct2-ui/windows/Cheats.cpp | 4 ++-- src/openrct2/actions/CheatSetAction.cpp | 2 +- src/openrct2/management/Finance.cpp | 3 +-- src/openrct2/scenario/Scenario.cpp | 2 +- src/openrct2/world/Park.cpp | 5 ++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 8f954e9dfd..b99cbdecab 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -848,12 +848,12 @@ static StringId window_cheats_page_titles[] = { switch (widgetIndex) { case WIDX_MONEY_SPINNER_INCREMENT: - _moneySpinnerValue = AddClamp( + _moneySpinnerValue = AddClamp( kCheatsMoneyIncrement * (_moneySpinnerValue / kCheatsMoneyIncrement), kCheatsMoneyIncrement); invalidateWidget(WIDX_MONEY_SPINNER); break; case WIDX_MONEY_SPINNER_DECREMENT: - _moneySpinnerValue = AddClamp( + _moneySpinnerValue = AddClamp( kCheatsMoneyIncrement * (_moneySpinnerValue / kCheatsMoneyIncrement), -kCheatsMoneyIncrement); invalidateWidget(WIDX_MONEY_SPINNER); break; diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index cc2e3fc1e2..5c59ce52e6 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -615,7 +615,7 @@ namespace OpenRCT2::GameActions void CheatSetAction::AddMoney(money64 amount) const { auto& park = getGameState().park; - park.cash = AddClamp(park.cash, amount); + park.cash = AddClamp(park.cash, amount); auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByClass(WindowClass::finances); diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index aadca32ddf..b97bd39f95 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -89,9 +89,8 @@ bool FinanceCheckAffordability(money64 cost, uint32_t flags) */ void FinancePayment(money64 amount, ExpenditureType type) { - // overflow check auto& park = getGameState().park; - park.cash = AddClamp(park.cash, -amount); + park.cash = AddClamp(park.cash, -amount); park.expenditureTable[0][EnumValue(type)] -= amount; if (kCountTowardsCurrentExpenditure[EnumValue(type)]) diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index a57b29e898..c56916809a 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -224,7 +224,7 @@ void ScenarioSuccessSubmitName(GameState_t& gameState, const char* name) static void ScenarioCheckEntranceFeeTooHigh() { const auto& park = getGameState().park; - const auto max_fee = AddClamp(park.totalRideValueForMoney, park.totalRideValueForMoney / 2); + const auto max_fee = AddClamp(park.totalRideValueForMoney, park.totalRideValueForMoney / 2); if ((park.flags & PARK_FLAGS_PARK_OPEN) && Park::GetEntranceFee() > max_fee) { diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index c08c608924..f3ed58761c 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -511,10 +511,9 @@ namespace OpenRCT2::Park money64 CalculateCompanyValue(const ParkData& park) { - auto result = park.value - park.bankLoan; + money64 result = park.value - park.bankLoan; - // Clamp addition to prevent overflow - result = AddClamp(result, park.cash); + result = AddClamp(result, park.cash); return result; }