mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 04:10:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'actor_souls_only' into 'master'

Browse source 
Check if the target is an actor before updating magic effects

Closes #6339

See merge request OpenMW/openmw!1294
This commit is contained in:
psi29a 2021-10-14 15:19:16 +00:00
commit 787da4891c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/combat.cpp
View file

@ -49,6 +49,7 @@ namespace MWMechanics
cast.mHitPosition = hitPosition; cast.mHitPosition = hitPosition;
cast.cast(object, false); cast.cast(object, false);
// Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills // Apply magic effects directly instead of waiting a frame to allow soul trap to work on one-hit kills
if(victim.getClass().isActor())
MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim); MWBase::Environment::get().getMechanicsManager()->updateMagicEffects(victim);
return true; return true;
} }