From 12c8c3276a5f39ea4c89e9e171d048fe2b7ce571 Mon Sep 17 00:00:00 2001 From: Leon Krieg Date: Thu, 15 Dec 2016 19:29:05 +0100 Subject: [PATCH] Disable NPC collision only when death animation has finished (#3666) --- apps/openmw/mwmechanics/actors.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 2a5995e0c..23a6f497f 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -1271,8 +1271,6 @@ namespace MWMechanics stats.getActiveSpells().clear(); calculateCreatureStatModifiers(iter->first, 0); - MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false); - if (cls.isEssential(iter->first)) MWBase::Environment::get().getWindowManager()->messageBox("#{sKilledEssential}"); } @@ -1290,6 +1288,11 @@ namespace MWMechanics //player's death animation is over MWBase::Environment::get().getStateManager()->askLoadRecent(); } + else + { + // NPC death animation is over, disable actor collision + MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false); + } // Play Death Music if it was the player dying if(iter->first == getPlayer())