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

Creature is immune to dispell is it has no active effects

Browse Source
This commit is contained in:
AlexVinS 2015-04-03 02:23:04 +03:00
parent 0a391cd367
commit f30d5612ed
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spells/BattleSpellMechanics.cpp
View File

@ -172,8 +172,16 @@ ESpellCastProblem::ESpellCastProblem DispellMechanics::canBeCasted(const CBattle
ESpellCastProblem::ESpellCastProblem DispellMechanics::isImmuneByStack(const CGHeroInstance * caster, const CStack * obj) const ESpellCastProblem::ESpellCastProblem DispellMechanics::isImmuneByStack(const CGHeroInstance * caster, const CStack * obj) const
{ {
//DISPELL ignores all immunities //DISPELL ignores all immunities, so do not call default
return ESpellCastProblem::OK; std::stringstream cachingStr;
cachingStr << "source_" << Bonus::SPELL_EFFECT;
if(obj->hasBonus(Selector::sourceType(Bonus::SPELL_EFFECT), cachingStr.str()))
{
return ESpellCastProblem::OK;
}
return ESpellCastProblem::WRONG_SPELL_TARGET;
} }
///EarthquakeMechanics ///EarthquakeMechanics

1
lib/spells/CDefaultSpellMechanics.cpp
View File

@ -216,7 +216,6 @@ bool DefaultSpellMechanics::applyAdventureEffects(const SpellCastEnvironment * e
} }
} }
void DefaultSpellMechanics::battleCast(const SpellCastEnvironment * env, BattleSpellCastParameters & parameters) const void DefaultSpellMechanics::battleCast(const SpellCastEnvironment * env, BattleSpellCastParameters & parameters) const
{ {
BattleSpellCast sc; BattleSpellCast sc;