From 88f8f25ffa6f745a6c49d9f874c03937100e8f33 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 Jun 2014 20:12:52 +0200
Subject: [PATCH] Don't allow scripted dialogue with dead actors (Fixes #1493)

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index aa7df1fd4..678e040c1 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -125,6 +125,10 @@ namespace MWDialogue
 
     void DialogueManager::startDialogue (const MWWorld::Ptr& actor)
     {
+        // Dialogue with dead actor (e.g. through script) should not be allowed.
+        if (actor.getClass().getCreatureStats(actor).isDead())
+            return;
+
         mLastTopic = "";
         mPermanentDispositionChange = 0;
         mTemporaryDispositionChange = 0;