From 67c14ada3cf38384d956a17c7a24fcb8ed3053da Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Fri, 1 Apr 2022 07:18:22 -0300 Subject: [PATCH] Add int32_t overload for ToMoney32FromGBP --- src/openrct2/common.h | 7 ++++++- src/openrct2/world/Park.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index fbc283632e..d22eb49625 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -98,7 +98,12 @@ constexpr money32 operator"" _GBP(long double money) noexcept return money * 10; } -constexpr money32 ToMoney32FromGBP(long double money) noexcept +constexpr money32 ToMoney32FromGBP(int32_t money) noexcept +{ + return money * 10; +} + +constexpr money32 ToMoney32FromGBP(double money) noexcept { return money * 10; } diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 89ef59f54c..1e0c0f417c 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -504,7 +504,7 @@ money64 Park::CalculateRideValue(const Ride* ride) const if (ride != nullptr && ride->value != RIDE_VALUE_UNDEFINED) { const auto& rtd = ride->GetRideTypeDescriptor(); - result = ToMoney32FromGBP(static_cast(ride->value)) + result = ToMoney32FromGBP(static_cast(ride->value)) * (static_cast(ride_customers_in_last_5_minutes(ride)) + rtd.BonusValue * 4LL); } return result;