mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 12:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Do not filter creature dialogue by NPC-only conditions (Fixes #3086)

Browse Source
This commit is contained in:
scrawl 2015-12-16 01:30:04 +01:00
parent d5a2586f38
commit 8222c78cf2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwdialogue/filter.cpp
View File

@ -41,7 +41,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
if (!info.mRace.empty()) if (!info.mRace.empty())
{ {
if (isCreature) if (isCreature)
return false; return true;
MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>(); MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
@ -53,7 +53,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
if (!info.mClass.empty()) if (!info.mClass.empty())
{ {
if (isCreature) if (isCreature)
return false; return true;
MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>(); MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
@ -65,7 +65,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
if (!info.mFaction.empty()) if (!info.mFaction.empty())
{ {
if (isCreature) if (isCreature)
return false; return true;
if (!Misc::StringUtils::ciEqual(mActor.getClass().getPrimaryFaction(mActor), info.mFaction)) if (!Misc::StringUtils::ciEqual(mActor.getClass().getPrimaryFaction(mActor), info.mFaction))
return false; return false;
@ -77,7 +77,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
else if (info.mData.mRank != -1) else if (info.mData.mRank != -1)
{ {
if (isCreature) if (isCreature)
return false; return true;
// Rank requirement, but no faction given. Use the actor's faction, if there is one. // Rank requirement, but no faction given. Use the actor's faction, if there is one.
// check rank // check rank
@ -156,10 +156,8 @@ bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
{ {
if (select.isNpcOnly() && (mActor.getTypeName() != typeid (ESM::NPC).name())) if (select.isNpcOnly() && (mActor.getTypeName() != typeid (ESM::NPC).name()))
// If the actor is a creature, we do not test the conditions applicable // If the actor is a creature, we do not test the conditions applicable
// only to NPCs. Such conditions can never be satisfied, apart // only to NPCs.
// inverted ones (NotClass, NotRace, NotFaction return true return true;
// because creatures are not of any race, class or faction).
return select.getType() == SelectWrapper::Type_Inverted;
switch (select.getType()) switch (select.getType())
{ {