games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Fix for #1058.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2012-08-28 15:38:00 +00:00
parent e913d94c62
commit 0b85cfaf78
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/BattleInterface/CBattleInterface.cpp
View File

@ -2768,8 +2768,11 @@ void CBattleInterface::handleHex(BattleHex myNumber, int eventType)
} }
}; };
const CStack * const shere = curInt->cb->battleGetStackByPos(myNumber, false);
const CStack * const sactive = activeStack; const CStack * const sactive = activeStack;
//Get stack on the hex - first try to grab the alive one, if not found -> allow dead stacks.
const CStack *shere = curInt->cb->battleGetStackByPos(myNumber, true);
if(!shere)
shere = curInt->cb->battleGetStackByPos(myNumber, false);
if (!sactive) if (!sactive)
return; return;

4
lib/CBattleCallback.cpp
View File

@ -1716,8 +1716,8 @@ ESpellCastProblem::ESpellCastProblem CBattleInfoCallback::battleCanCastThisSpell
//get dead stack if we cast resurrection or animate dead //get dead stack if we cast resurrection or animate dead
const CStack *deadStack = getStackIf([dest](const CStack *s) { return !s->alive() && s->position == dest; }); const CStack *deadStack = getStackIf([dest](const CStack *s) { return !s->alive() && s->coversPos(dest); });
const CStack *aliveStack = getStackIf([dest](const CStack *s) { return s->alive() && s->position == dest;}); const CStack *aliveStack = getStackIf([dest](const CStack *s) { return s->alive() && s->coversPos(dest);});
if(spell->isRisingSpell()) if(spell->isRisingSpell())