From 8b3a393a6b1b0a93cc7ac58353cbd197c3aaf346 Mon Sep 17 00:00:00 2001
From: mrcheko <cheko@sevas.ua>
Date: Fri, 13 Dec 2013 19:33:01 +0200
Subject: [PATCH] bug fix at http://bugs.openmw.org/issues/985

---
 apps/openmw/mwclass/npc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index e7c10d3c8..5e9801c49 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -711,6 +711,8 @@ namespace MWClass
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr, true));
         if(get(actor).getStance(actor, MWWorld::Class::Sneak))
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
+        if(get(ptr).getCreatureStats(ptr).isHostile())
+            return boost::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("#{sActorInCombat}"));
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
     }