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

Fixed #831

Browse Source
This commit is contained in:
DjWarmonger
2013-02-18 07:12:19 +00:00
parent 111312636a
commit 2e385375b7
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -4023,12 +4023,6 @@ void CGameHandler::handleSpellCasting( SpellID spellID, int spellLvl, BattleHex
sc.resisted = gs->curB->calculateResistedStacks(spell, caster, secHero, attackedCres, casterColor, mode, usedSpellPower, spellLvl); sc.resisted = gs->curB->calculateResistedStacks(spell, caster, secHero, attackedCres, casterColor, mode, usedSpellPower, spellLvl);
//calculating dmg to display //calculating dmg to display
BOOST_FOREACH (auto cre, attackedCres)
{
if(vstd::contains(sc.resisted, cre->ID)) //this creature resisted the spell
continue;
sc.dmgToDisplay += gs->curB->calculateSpellDmg(spell, caster, cre, spellLvl, usedSpellPower);
}
if (spellID == SpellID::DEATH_STARE || spellID == SpellID::ACID_BREATH_DAMAGE) if (spellID == SpellID::DEATH_STARE || spellID == SpellID::ACID_BREATH_DAMAGE)
{ {
sc.dmgToDisplay = usedSpellPower; sc.dmgToDisplay = usedSpellPower;
@ -4070,10 +4064,10 @@ void CGameHandler::handleSpellCasting( SpellID spellID, int spellLvl, BattleHex
if (spellDamage) if (spellDamage)
bsa.damageAmount = spellDamage >> chainLightningModifier; bsa.damageAmount = spellDamage >> chainLightningModifier;
else else
{
bsa.damageAmount = gs->curB->calculateSpellDmg(spell, caster, *it, spellLvl, usedSpellPower) >> chainLightningModifier; bsa.damageAmount = gs->curB->calculateSpellDmg(spell, caster, *it, spellLvl, usedSpellPower) >> chainLightningModifier;
sc.dmgToDisplay += bsa.damageAmount; sc.dmgToDisplay += bsa.damageAmount;
}
bsa.stackAttacked = (*it)->ID; bsa.stackAttacked = (*it)->ID;
if (mode == ECastingMode::ENCHANTER_CASTING) //multiple damage spells cast if (mode == ECastingMode::ENCHANTER_CASTING) //multiple damage spells cast
bsa.attackerID = stack->ID; bsa.attackerID = stack->ID;