Issue #219: made all unimplemented filters return false

actorid
Marc Zinnschlag 12 years ago
parent ceaf1677ce
commit d6961c0246

@ -168,7 +168,7 @@ namespace MWDialogue
}
}
return false;
return true;
}
bool DialogueManager::isMatching (const MWWorld::Ptr& actor,

@ -243,6 +243,10 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
switch (select.getFunction())
{
case SelectWrapper::Function_False:
return false;
case SelectWrapper::Function_Id:
return select.getName()==toLower (MWWorld::Class::get (mActor).getId (mActor));

@ -69,7 +69,7 @@ MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::decodeFunction()
case 67: case 68: case 69: case 70: return Function_AiSetting;
}
return Function_None;
return Function_False;
}
MWDialogue::SelectWrapper::SelectWrapper (const ESM::DialInfo::SelectStruct& select) : mSelect (select) {}
@ -136,6 +136,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
static const Function booleanFunctions[] =
{
Function_False,
Function_Id, Function_Faction, Function_Class, Function_Race, Function_Cell,
Function_SameFaction,
Function_PcCommonDisease, Function_PcBlightDisease, Function_PcCorprus,

@ -13,7 +13,7 @@ namespace MWDialogue
enum Function
{
Function_None,
Function_None, Function_False,
Function_Journal,
Function_Item,
Function_Dead,

Loading…
Cancel
Save