mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'double_float_conv' into 'master'

Browse Source 
Fix unnecessary float-to-double promotion

See merge request OpenMW/openmw!1532
This commit is contained in:
Evil Eye 2022-01-04 22:01:53 +00:00
commit c3d3535ffd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/creaturestats.cpp
View File

@ -44,7 +44,7 @@ namespace MWMechanics
float max = getFatigue().getModified(); float max = getFatigue().getModified();
float current = getFatigue().getCurrent(); 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 = const MWWorld::Store<ESM::GameSetting> &gmst =
MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>(); MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();

4
apps/openmw/mwmechanics/trading.cpp
View File

@ -71,10 +71,10 @@ namespace MWMechanics
int initialMerchantOffer = std::abs(merchantOffer); int initialMerchantOffer = std::abs(merchantOffer);
if ( !buying && (finalPrice > initialMerchantOffer) ) { if ( !buying && (finalPrice > initialMerchantOffer) ) {
skillGain = floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice); skillGain = std::floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
} }
else if ( buying && (finalPrice < initialMerchantOffer) ) { 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); player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);