games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

TotalValue: fix typo

Browse Source
This commit is contained in:
Konstantin 2023-03-18 15:32:31 +03:00
parent f24ca6fbcf
commit b07f4fb383
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/HeroBonus.cpp
View File

@ -450,18 +450,18 @@ int BonusList::totalValue() const
int percentToBase = 0;
int percentToAll = 0;
int additive = 0;
int percentToSource;
int percentToSource = 0;
int indepMin = std::numeric_limits<int>::max();
int indepMax = std::numeric_limits<int>::min();
};
auto percent = [](int base, int percent) -> int {return (base * (100 + percent)) / 100; };
auto percent = [](int base, int percent) -> int {return (base * (100 + percent)) / 100;};
std::array <BonusCollection, Bonus::BonusSource::NUM_BONUS_SOURCE> sources = {};
BonusCollection any;
bool hasIndepMax = false;
bool hasIndepMin = false;
for(const std::shared_ptr<Bonus> & b : bonuses)
for(const auto & b : bonuses)
{
switch(b->valType)
{
@ -493,16 +493,16 @@ int BonusList::totalValue() const
break;
}
}
for(auto src : sources)
for(const auto & src : sources)
{
any.base += percent(src.base ,src.percentToSource);
any.base += percent(src.base, src.percentToSource);
any.percentToBase += percent(src.percentToBase, src.percentToSource);
any.percentToAll += percent(src.percentToAll, src.percentToSource);
any.additive += percent(src.additive, src.percentToSource);
if(hasIndepMin)
vstd::amin(any.indepMin, percent(src.indepMin, src.percentToSource));
if(hasIndepMax)
vstd::amax(any.indepMax, percent(src.indepMin, src.percentToSource));
vstd::amax(any.indepMax, percent(src.indepMax, src.percentToSource));
}
any.base = percent(any.base, any.percentToBase);
any.base += any.additive;