1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 21:40:03 +00:00

Merge remote-tracking branch 'scrawl/rank'

This commit is contained in:
Marc Zinnschlag 2013-04-22 09:52:28 +02:00
commit 29cb076113

View File

@ -73,6 +73,11 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
if (iter->second < info.mData.mRank) if (iter->second < info.mData.mRank)
return false; return false;
} }
else if (info.mData.mRank != -1)
{
// if there is a rank condition, but the NPC is not in a faction, always fail
return false;
}
// Gender // Gender
if (!isCreature) if (!isCreature)