games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

* fix for 177

Browse Source
This commit is contained in:
mateuszb
2010-03-26 18:46:39 +00:00
parent 0f0ad8031a
commit 4be483cacd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/CGameState.cpp
View File

@@ -2556,23 +2556,28 @@ std::pair<ui32, ui32> BattleInfo::calculateDmgRange(const CStack* attacker, cons
minDmg *= dmgBonusMultiplier;
maxDmg *= dmgBonusMultiplier;
std::pair<ui32, ui32> returnedVal;
if(attacker->getEffect(42)) //curse handling (rest)
{
minDmg -= VLC->spellh->spells[42].powers[attacker->getEffect(42)->level];
return std::make_pair(int(minDmg), int(minDmg));
returnedVal = std::make_pair(int(minDmg), int(minDmg));
}
else if(attacker->getEffect(41)) //bless handling
{
maxDmg += VLC->spellh->spells[41].powers[attacker->getEffect(41)->level];
return std::make_pair(int(maxDmg), int(maxDmg));
returnedVal = std::make_pair(int(maxDmg), int(maxDmg));
}
else
{
return std::make_pair(int(minDmg), int(maxDmg));
returnedVal = std::make_pair(int(minDmg), int(maxDmg));
}
tlog1 << "We are too far in calculateDmg...\n";
return std::make_pair(0, 0);
//damage cannot be less than 1
amin(returnedVal.first, 1);
amin(returnedVal.second, 1);
return returnedVal;
}
ui32 BattleInfo::calculateDmg(const CStack* attacker, const CStack* defender, const CGHeroInstance * attackerHero, const CGHeroInstance * defendingHero, bool shooting, ui8 charge)