From 18a2d238abde3cedd372d2b828965ff19f2ae56a Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 15 Jul 2018 04:36:42 +0300
Subject: [PATCH] [Client] Don't pop up dialogue screen when an NPC activates
 another NPC

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

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index f6ba8574a..b069c9037 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1010,6 +1010,19 @@ namespace MWClass
             End of tes3mp addition
         */
 
+        /*
+            Start of tes3mp addition
+
+            Avoid returning an ActionTalk when a non-player NPC activates another
+            non-player NPC, because it will always pop up a dialogue screen for
+            the local player
+        */
+        if (ptr != MWMechanics::getPlayer() && actor != MWMechanics::getPlayer())
+            return std::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction(""));
+        /*
+            End of tes3mp addition
+        */
+
         // player got activated by another NPC
         if(ptr == MWMechanics::getPlayer())
             return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));