From 28639c3b2f484c1d3a87ad2654496705540f634f Mon Sep 17 00:00:00 2001 From: Kurnevsky Evgeny Date: Sat, 3 Dec 2016 17:13:31 +0300 Subject: [PATCH] Crash fix when item is disabled before it casts spell. --- apps/openmw/mwmechanics/spellcasting.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index 5c5fc3899..5865c32b9 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -913,7 +913,7 @@ namespace MWMechanics MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster); - if (mCaster.getClass().isActor()) // TODO: Non-actors should also create a spell cast vfx + if (animation && mCaster.getClass().isActor()) // TODO: Non-actors should also create a spell cast vfx even if they are disabled (animation == NULL) { const ESM::Static* castStatic; @@ -927,7 +927,7 @@ namespace MWMechanics animation->addEffect("meshes\\" + castStatic->mModel, effect->mIndex, false, "", texture); } - if (!mCaster.getClass().isActor()) + if (animation && !mCaster.getClass().isActor()) animation->addSpellCastGlow(effect); static const std::string schools[] = {