From 9e00c6694fac95cf66e360ee3905abd5e59c1814 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Tue, 15 Jan 2013 21:40:44 +0100
Subject: [PATCH] Allow only ID filtered topics for dialogue with creatures

---
 apps/openmw/mwdialogue/filter.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 7c590c8ef2..99be5554a5 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -19,12 +19,19 @@
 
 bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 {
+    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+
     // actor id
     if (!info.mActor.empty())
+    {
         if ( Misc::StringUtils::lowerCase (info.mActor)!=MWWorld::Class::get (mActor).getId (mActor))
             return false;
-
-    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+    }
+    else if (isCreature)
+    {
+        // Creatures must not have topics aside of those specific to their id
+        return false;
+    }
 
     // NPC race
     if (!info.mRace.empty())