mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Rename dword_988E60 to kCountTowardsCurrentExpenditure

Browse Source
This commit is contained in:
Gymnasiast
2025-08-21 21:10:21 +02:00
parent ceb94ed772
commit 023524bdbf
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,21 @@ const money64 kResearchCosts[RESEARCH_FUNDING_COUNT] = {
400.00_GBP, // Maximum funding 400.00_GBP, // Maximum funding
}; };
static constexpr int32_t dword_988E60[EnumValue(ExpenditureType::count)] = { static constexpr bool kCountTowardsCurrentExpenditure[EnumValue(ExpenditureType::count)] = {
1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, true, // ExpenditureType::rideConstruction
false, // ExpenditureType::rideRunningCosts
true, // ExpenditureType::landPurchase
true, // ExpenditureType::landscaping
true, // ExpenditureType::parkEntranceTickets
true, // ExpenditureType::parkRideTickets
true, // ExpenditureType::shopSales
true, // ExpenditureType::shopStock
true, // ExpenditureType::foodDrinkSales
true, // ExpenditureType::foodDrinkStock
false, // ExpenditureType::wages
true, // ExpenditureType::marketing
false, // ExpenditureType::research
false, // ExpenditureType::interest
}; };
/** /**
@@ -81,7 +94,7 @@ void FinancePayment(money64 amount, ExpenditureType type)
gameState.park.cash = AddClamp<money64>(gameState.park.cash, -amount); gameState.park.cash = AddClamp<money64>(gameState.park.cash, -amount);
gameState.park.expenditureTable[0][EnumValue(type)] -= amount; gameState.park.expenditureTable[0][EnumValue(type)] -= amount;
if (dword_988E60[EnumValue(type)] & 1) if (kCountTowardsCurrentExpenditure[EnumValue(type)])
{ {
// Cumulative amount of money spent this day // Cumulative amount of money spent this day
gameState.park.currentExpenditure -= amount; gameState.park.currentExpenditure -= amount;