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

Add int32_t overload for ToMoney32FromGBP

Browse Source
This commit is contained in:
Tulio Leao
2022-04-01 07:18:22 -03:00
parent e63432a416
commit 67c14ada3c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/common.h
View File

@@ -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;
}

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

@@ -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<double long>(ride->value))
result = ToMoney32FromGBP(static_cast<int32_t>(ride->value))
* (static_cast<money64>(ride_customers_in_last_5_minutes(ride)) + rtd.BonusValue * 4LL);
}
return result;