diff options
author | Evil Eye <malusluminis@hotmail.com> | 2022-01-04 22:01:53 +0000 |
---|---|---|
committer | Evil Eye <malusluminis@hotmail.com> | 2022-01-04 22:01:53 +0000 |
commit | c3d3535ffd471f03cdc48939d7ab3fca496aff70 (patch) | |
tree | a036af9e34beb487efb86d78d1ac85536787b9f4 | |
parent | 0eed275b74e66b1462e64ccbd6722318cf8696e8 (diff) | |
parent | 27af7767352ede07f33f5e7e74aae8f9a2a64d3a (diff) |
Merge branch 'double_float_conv' into 'master'
Fix unnecessary float-to-double promotion
See merge request OpenMW/openmw!1532
-rw-r--r-- | apps/openmw/mwmechanics/creaturestats.cpp | 2 | ||||
-rw-r--r-- | apps/openmw/mwmechanics/trading.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp index c99f87e833..570547e0d9 100644 --- a/apps/openmw/mwmechanics/creaturestats.cpp +++ b/apps/openmw/mwmechanics/creaturestats.cpp @@ -44,7 +44,7 @@ namespace MWMechanics float max = getFatigue().getModified(); float current = getFatigue().getCurrent(); - float normalised = floor(max) == 0 ? 1 : std::max (0.0f, current / max); + float normalised = std::floor(max) == 0 ? 1 : std::max (0.0f, current / max); const MWWorld::Store<ESM::GameSetting> &gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>(); diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp index 750fd803d4..d9ec66bab2 100644 --- a/apps/openmw/mwmechanics/trading.cpp +++ b/apps/openmw/mwmechanics/trading.cpp @@ -71,10 +71,10 @@ namespace MWMechanics int initialMerchantOffer = std::abs(merchantOffer); if ( !buying && (finalPrice > initialMerchantOffer) ) { - skillGain = floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice); + skillGain = std::floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice); } else if ( buying && (finalPrice < initialMerchantOffer) ) { - skillGain = floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer); + skillGain = std::floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer); } player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain); |