From a42e60970bdebb10a4c3841e5b9145ad8b42499c Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 13 Sep 2014 20:55:57 +0200 Subject: [PATCH] Revert "delete death events on adding an actor to the scene" If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently. This reverts commit fd2c07a6f47b26469d01d05b7a284aa87f9caef2. Conflicts: apps/openmw/mwmechanics/actors.cpp --- apps/openmw/mwmechanics/actors.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 31a0856605..88e89a774c 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -1044,9 +1044,6 @@ namespace MWMechanics void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately) { - // erase previous death events since we are currently only tracking them while in an active cell - ptr.getClass().getCreatureStats(ptr).clearHasDied(); - removeActor(ptr); MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);