mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-28 12:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1181 from Assumeru/teleportation

Browse Source 
Fix teleportation being unreachable
This commit is contained in:
scrawl 2017-01-04 14:17:21 +01:00 committed by GitHub
commit 0cd4fc8cae
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwmechanics/spellcasting.cpp
View File

@ -613,14 +613,11 @@ namespace MWMechanics
return true; return true;
} }
} }
else if (target.getClass().isActor()) else if (target.getClass().isActor() && effectId == ESM::MagicEffect::Dispel)
{
if (effectId == ESM::MagicEffect::Dispel)
{ {
target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude); target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude);
return true; 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);