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

Remove unnecessary type specifiers from AddClamp calls

Browse Source
This commit is contained in:
matheusvb3
2025-11-22 20:13:09 -03:00
committed by GitHub
parent 29d40387ef
commit fc9e14caa8
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Cheats.cpp
View File

@@ -848,12 +848,12 @@ static StringId window_cheats_page_titles[] = {
switch (widgetIndex)
{
case WIDX_MONEY_SPINNER_INCREMENT:
_moneySpinnerValue = AddClamp<money64>(
_moneySpinnerValue = AddClamp(
kCheatsMoneyIncrement * (_moneySpinnerValue / kCheatsMoneyIncrement), kCheatsMoneyIncrement);
invalidateWidget(WIDX_MONEY_SPINNER);
break;
case WIDX_MONEY_SPINNER_DECREMENT:
_moneySpinnerValue = AddClamp<money64>(
_moneySpinnerValue = AddClamp(
kCheatsMoneyIncrement * (_moneySpinnerValue / kCheatsMoneyIncrement), -kCheatsMoneyIncrement);
invalidateWidget(WIDX_MONEY_SPINNER);
break;

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

@@ -615,7 +615,7 @@ namespace OpenRCT2::GameActions
void CheatSetAction::AddMoney(money64 amount) const
{
auto& park = getGameState().park;
park.cash = AddClamp<money64>(park.cash, amount);
park.cash = AddClamp(park.cash, amount);
auto* windowMgr = Ui::GetWindowManager();
windowMgr->InvalidateByClass(WindowClass::finances);

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

@@ -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<money64>(park.cash, -amount);
park.cash = AddClamp(park.cash, -amount);
park.expenditureTable[0][EnumValue(type)] -= amount;
if (kCountTowardsCurrentExpenditure[EnumValue(type)])

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

@@ -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<money64>(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)
{

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

@@ -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<money64>(result, park.cash);
result = AddClamp(result, park.cash);
return result;
}