games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Change nix rounding, revert assert comment

Browse Source
This commit is contained in:
M
2024-01-10 22:18:53 +01:00
parent 56165818b4
commit 815fa26fb3
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/battle/BattleInterface.cpp
View File

@@ -791,7 +791,7 @@ void BattleInterface::waitForAnimations()
} }
assert(!hasAnimations()); assert(!hasAnimations());
//assert(awaitingEvents.empty()); assert(awaitingEvents.empty());
if (!awaitingEvents.empty()) if (!awaitingEvents.empty())
{ {

11
lib/battle/DamageCalculator.cpp
View File

@@ -132,15 +132,12 @@ int DamageCalculator::getActorAttackEffective() const
int DamageCalculator::getActorAttackIgnored() const int DamageCalculator::getActorAttackIgnored() const
{ {
double multAttackReduction = battleBonusValue(info.defender, Selector::type()(BonusType::ENEMY_ATTACK_REDUCTION)) / 100.0; int multAttackReductionPercent = battleBonusValue(info.defender, Selector::type()(BonusType::ENEMY_ATTACK_REDUCTION));
if(multAttackReduction > 0) if(multAttackReductionPercent > 0)
{ {
int defaultRoundingMode = std::fegetround(); int reduction = (getActorAttackBase() * multAttackReductionPercent + 49) / 100; //using ints so 1.5 for 5 attack is rounded down as in HotA / h3assist etc. (keep in mind h3assist 1.2 shows wrong value for 15 attack points and unupg. nix)
std::fesetround(FE_TOWARDZERO); return -std::min(reduction, getActorAttackBase());
int reduction = std::nearbyint(multAttackReduction * getActorAttackBase());
std::fesetround(defaultRoundingMode);
return -std::min(reduction,getActorAttackBase());
} }
return 0; return 0;
} }