mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Replace remaining usages of money16, money32 (#19469)

Browse Source 
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
This commit is contained in:
Michael Steenbeek
2023-03-02 22:55:42 +01:00
committed by GitHub
parent 6a89dfbfe9
commit dd624f9bff
105 changed files with 535 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -201,8 +201,8 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_
}
else
{
int32_t res = SetOperatingSetting(RideId::FromUnderlying(ride_index), RideSetSetting::RideType, type);
if (res == MONEY32_UNDEFINED)
auto res = SetOperatingSetting(RideId::FromUnderlying(ride_index), RideSetSetting::RideType, type);
if (res == MONEY64_UNDEFINED)
{
if (!gCheatsAllowArbitraryRideTypeChanges)
{
@@ -431,7 +431,7 @@ static int32_t ConsoleCommandRides(InteractiveConsole& console, const arguments_
else
{
int32_t rideId = ConsoleParseInt(argv[2], &int_valid[0]);
money16 price = ConsoleParseInt(argv[3], &int_valid[1]);
money64 price = ConsoleParseInt(argv[3], &int_valid[1]);
if (!int_valid[0] || !int_valid[1])
{
@@ -762,7 +762,7 @@ static int32_t ConsoleCommandSet(InteractiveConsole& console, const arguments_t&
if (argv[0] == "money" && InvalidArguments(&invalidArgs, double_valid[0]))
{
money32 money = ToMoney64FromGBP(double_val[0]);
money64 money = ToMoney64FromGBP(double_val[0]);
if (gCash != money)
{
auto cheatSetAction = CheatSetAction(CheatType::SetMoney, money);