From 2ca741570891b57261527b91aab966423edc4bbc Mon Sep 17 00:00:00 2001 From: scrawl Date: Sun, 1 May 2016 00:10:50 +0200 Subject: [PATCH] Handle DialInfo::mFactionLess (Bug #3380) --- apps/openmw/mwdialogue/filter.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp index 99e689411..042f41f14 100644 --- a/apps/openmw/mwdialogue/filter.cpp +++ b/apps/openmw/mwdialogue/filter.cpp @@ -62,7 +62,15 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const } // NPC faction - if (!info.mFaction.empty()) + if (info.mFactionLess) + { + if (isCreature) + return true; + + if (!mActor.getClass().getPrimaryFaction(mActor).empty()) + return false; + } + else if (!info.mFaction.empty()) { if (isCreature) return true;