diff --git a/client/battle/CBattleAnimations.cpp b/client/battle/CBattleAnimations.cpp index 6a161774d..99dc88a81 100644 --- a/client/battle/CBattleAnimations.cpp +++ b/client/battle/CBattleAnimations.cpp @@ -984,10 +984,7 @@ bool CSpellEffectAnimation::init() be.x += (destStack->attackerOwned ? -1 : 1)*tilePos.w/2; //Indicate if effect should be drawn on top of everything or just on top of the hex - if(areaEffect) - be.position = BattleHex::INVALID; - else - be.position = destTile; + be.position = destTile; owner->battleEffects.push_back(be); diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp index 60504f7c6..5baf922d4 100644 --- a/client/battle/CBattleInterface.cpp +++ b/client/battle/CBattleInterface.cpp @@ -1557,7 +1557,8 @@ void CBattleInterface::castThisSpell(int spellID) void CBattleInterface::displayEffect(ui32 effect, int destTile, bool areaEffect) { - addNewAnim(new CSpellEffectAnimation(this, effect, destTile, 0, 0, false, areaEffect)); + //todo: recheck areaEffect usage + addNewAnim(new CSpellEffectAnimation(this, effect, destTile, 0, 0, false)); } void CBattleInterface::battleTriggerEffect(const BattleTriggerEffect & bte) @@ -1762,7 +1763,6 @@ void CBattleInterface::getPossibleActionsForStack(const CStack * stack) void CBattleInterface::printConsoleAttacked( const CStack * defender, int dmg, int killed, const CStack * attacker, bool multiple ) { boost::format txt; - int end = 0; if (attacker) //ignore if stacks were killed by spell { txt = boost::format (CGI->generaltexth->allTexts[attacker->count > 1 ? 377 : 376]) %