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

- Hopefully fixed #1103

Browse Source 
- Fixed #1137
This commit is contained in:
DjWarmonger
2012-11-14 14:27:18 +00:00
parent e08db9790b
commit a7cea94247
7 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/BattleState.cpp
View File

@@ -720,14 +720,14 @@ std::vector<ui32> BattleInfo::calculateResistedStacks(const CSpell * sp, const C
std::vector<ui32> ret;
for(auto it = affectedCreatures.begin(); it != affectedCreatures.end(); ++it)
{
if(battleIsImmune(caster, sp, mode, (*it)->position) != ESpellCastProblem::OK)
if(battleIsImmune(caster, sp, mode, (*it)->position) != ESpellCastProblem::OK) //FIXME: immune stacks should not display resisted animation
{
ret.push_back((*it)->ID);
continue;
}
//non-negative spells on friendly stacks should always succeed, unless immune
if(!sp->isNegative() && (*it)->owner == casterSideOwner)
//non-negative spells should always succeed, unless immune
if(!sp->isNegative())// && (*it)->owner == casterSideOwner)
continue;
/*