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

Fix CSpellEffectAnimation call parameters

Browse Source 
(!) need check areaEffect usage
This commit is contained in:
AlexVinS 2014-11-27 17:39:37 +03:00
parent f1ab328a09
commit c67f52732a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/battle/CBattleAnimations.cpp
View File

@ -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);

4
client/battle/CBattleInterface.cpp
View File

@ -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]) %