From f2e25b8a476a2fad5c35d29c7e894bd716a110f3 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 20 Oct 2012 10:49:48 +0200
Subject: [PATCH] Issue #68: Keep dead actors out of the actor list for the
 current scene

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 ++
 apps/openmw/mwmechanics/actors.cpp              | 3 ++-
 apps/openmw/mwmechanics/actors.hpp              | 2 ++
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 39d7e6e1a4..c5d721e264 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -39,6 +39,8 @@ namespace MWBase
 
             virtual void addActor (const MWWorld::Ptr& ptr) = 0;
             ///< Register an actor for stats management
+            ///
+            /// \note Dead actors are ignored.
 
             virtual void removeActor (const MWWorld::Ptr& ptr) = 0;
             ///< Deregister an actor for stats management
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 43d9e8a3b7..63f890d65d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -165,7 +165,8 @@ namespace MWMechanics
 
     void Actors::addActor (const MWWorld::Ptr& ptr)
     {
-        mActors.insert (ptr);
+        if (!MWWorld::Class::get (ptr).getCreatureStats (ptr).isDead())
+            mActors.insert (ptr);
     }
 
     void Actors::removeActor (const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 7e5a0ac861..f8a00f3492 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -40,6 +40,8 @@ namespace MWMechanics
 
             void addActor (const MWWorld::Ptr& ptr);
             ///< Register an actor for stats management
+            ///
+            /// \note Dead actors are ignored.
 
             void removeActor (const MWWorld::Ptr& ptr);
             ///< Deregister an actor for stats management
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 3a41e8fa60..205deaf714 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -41,6 +41,8 @@ namespace MWMechanics
 
             virtual void addActor (const MWWorld::Ptr& ptr);
             ///< Register an actor for stats management
+            ///
+            /// \note Dead actors are ignored.
 
             virtual void removeActor (const MWWorld::Ptr& ptr);
             ///< Deregister an actor for stats management