games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-25 21:38:59 +02:00
Code Issues Releases Activity

Remove suspicios code in display damage calculation

Browse Source
This commit is contained in:
AlexVinS 2015-09-16 09:03:36 +03:00
parent 16f0714474
commit 0929e009db
2 changed files with 4 additions and 5 deletions

4
lib/spells/BattleSpellMechanics.h

@ -21,11 +21,11 @@ public:
RESURRECT, RESURRECT,
TRUE_RESURRECT TRUE_RESURRECT
}; };
HealingSpellMechanics(CSpell * s): DefaultSpellMechanics(s){}; HealingSpellMechanics(CSpell * s): DefaultSpellMechanics(s){};
protected: protected:
void applyBattleEffects(const SpellCastEnvironment * env, BattleSpellCastParameters & parameters, SpellCastContext & ctx) const override; void applyBattleEffects(const SpellCastEnvironment * env, BattleSpellCastParameters & parameters, SpellCastContext & ctx) const override;
virtual EHealLevel getHealLevel(int effectLevel) const = 0; virtual EHealLevel getHealLevel(int effectLevel) const = 0;
}; };

5
lib/spells/CDefaultSpellMechanics.cpp

@ -524,11 +524,10 @@ void DefaultSpellMechanics::applyBattleEffects(const SpellCastEnvironment * env,
{ {
int unitSpellPower = parameters.casterStack->valOfBonuses(Bonus::SPECIFIC_SPELL_POWER, owner->id.toEnum()); int unitSpellPower = parameters.casterStack->valOfBonuses(Bonus::SPECIFIC_SPELL_POWER, owner->id.toEnum());
if(unitSpellPower) if(unitSpellPower)
ctx.sc.dmgToDisplay = spellDamage = parameters.casterStack->count * unitSpellPower; //TODO: handle immunities spellDamage = parameters.casterStack->count * unitSpellPower; //TODO: handle immunities
else //Faerie Dragon else //Faerie Dragon
{ {
parameters.usedSpellPower = parameters.casterStack->valOfBonuses(Bonus::CREATURE_SPELL_POWER) * parameters.casterStack->count / 100; parameters.usedSpellPower = parameters.casterStack->valOfBonuses(Bonus::CREATURE_SPELL_POWER) * parameters.casterStack->count / 100;
ctx.sc.dmgToDisplay = 0;
} }
} }
int chainLightningModifier = 0; int chainLightningModifier = 0;