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

Formatting & cleanup

Browse Source
This commit is contained in:
AlexVinS
2014-11-25 18:27:18 +03:00
parent c67887ae58
commit 20a058f3f9
1 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SpellMechanics.cpp
View File

@ -374,15 +374,6 @@ void DefaultSpellMechanics::battleCast(const SpellCastEnvironment * env, BattleS
StacksInjured si; StacksInjured si;
SpellCastContext ctx(attackedCres, sc, si); SpellCastContext ctx(attackedCres, sc, si);
//TODO: extract dmg to display calculation
//calculating dmg to display
if (owner->id == SpellID::DEATH_STARE || owner->id == SpellID::ACID_BREATH_DAMAGE)
{
sc.dmgToDisplay = parameters.usedSpellPower;
if (owner->id == SpellID::DEATH_STARE)
vstd::amin(sc.dmgToDisplay, (*attackedCres.begin())->count); //stack is already reduced after attack
}
applyBattleEffects(env, parameters, ctx); applyBattleEffects(env, parameters, ctx);
env->sendAndApply(&sc); env->sendAndApply(&sc);
@ -464,8 +455,6 @@ int DefaultSpellMechanics::calculateDuration(const CGHeroInstance* caster, int u
void DefaultSpellMechanics::applyBattleEffects(const SpellCastEnvironment* env, BattleSpellCastParameters & parameters, SpellCastContext & ctx) const void DefaultSpellMechanics::applyBattleEffects(const SpellCastEnvironment* env, BattleSpellCastParameters & parameters, SpellCastContext & ctx) const
{ {
//TODO:applying effects
//applying effects //applying effects
if(owner->isOffensiveSpell()) if(owner->isOffensiveSpell())
{ {