From d4ffd30f98fe50e1810236b26a6925781717f50d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 17 Jul 2014 20:57:37 +0200
Subject: [PATCH] Implement Rank filter with no faction given (Fixes #1660)

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

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 08cdb1d00..daa9a684a 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -76,8 +76,18 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
     }
     else if (info.mData.mRank != -1)
     {
-        // if there is a rank condition, but the NPC is not in a faction, always fail
-        return false;
+        if (isCreature)
+            return false;
+
+        // Rank requirement, but no faction given. Use the actor's faction, if there is one.
+        MWMechanics::NpcStats& stats = mActor.getClass().getNpcStats (mActor);
+
+        if (!stats.getFactionRanks().size())
+            return false;
+
+        // check rank
+        if (stats.getFactionRanks().begin()->second < info.mData.mRank)
+            return false;
     }
 
     // Gender