forked from mirror/openmw-tes3mp
added test for actor faction
This commit is contained in:
parent
594d3cef4f
commit
19c5ace602
1 changed files with 11 additions and 2 deletions
|
@ -208,7 +208,17 @@ namespace MWDialogue
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO check actor faction
|
if (!info.npcFaction.empty())
|
||||||
|
{
|
||||||
|
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *cellRef = actor.get<ESM::NPC>();
|
||||||
|
|
||||||
|
if (!cellRef)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (toLower (info.npcFaction)!=toLower (cellRef->base->faction))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO check player faction
|
// TODO check player faction
|
||||||
|
|
||||||
// check cell
|
// check cell
|
||||||
|
@ -225,7 +235,6 @@ namespace MWDialogue
|
||||||
|
|
||||||
std::cout
|
std::cout
|
||||||
<< "unchecked entries:" << std::endl
|
<< "unchecked entries:" << std::endl
|
||||||
<< " actor faction: " << info.npcFaction << std::endl
|
|
||||||
<< " player faction: " << info.pcFaction << std::endl
|
<< " player faction: " << info.pcFaction << std::endl
|
||||||
<< " DATAstruct" << std::endl;
|
<< " DATAstruct" << std::endl;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue