Merge remote-tracking branch 'mrcheko/master'

11 years ago · 0890fa66b0
parent 357ecd92b2 8b3a393a6b
commit 0890fa66b0
1 changed files with 2 additions and 0 deletions
--- 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));
    }