mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 00:23:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1180 from Allofich/dispel

Browse source 
Make dispel an instant effect again (Fixes #3695)
This commit is contained in:
scrawl 2017-01-02 15:34:13 +01:00 committed by GitHub
commit cba1aff9ab
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -613,6 +613,14 @@ namespace MWMechanics
return true; return true;
} }
} }
else if (target.getClass().isActor())
{
if (effectId == ESM::MagicEffect::Dispel)
{
target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude);
return true;
}
}
else if (target.getClass().isActor() && target == getPlayer()) else if (target.getClass().isActor() && target == getPlayer())
{ {
MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster); MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
@ -1140,9 +1148,6 @@ namespace MWMechanics
case ESM::MagicEffect::CureCorprusDisease: case ESM::MagicEffect::CureCorprusDisease:
actor.getClass().getCreatureStats(actor).getSpells().purgeCorprusDisease(); actor.getClass().getCreatureStats(actor).getSpells().purgeCorprusDisease();
break; break;
case ESM::MagicEffect::Dispel:
actor.getClass().getCreatureStats(actor).getActiveSpells().purgeAll(magnitude);
break;
case ESM::MagicEffect::RemoveCurse: case ESM::MagicEffect::RemoveCurse:
actor.getClass().getCreatureStats(actor).getSpells().purgeCurses(); actor.getClass().getCreatureStats(actor).getSpells().purgeCurses();
break; break;