teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

added test for actor race

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-08 14:36:45 +02:00
parent 2acfe22975
commit c7fab9aad6
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwdialogue/dialoguemanager.cpp
View file

@ -119,7 +119,17 @@ namespace MWDialogue
if (info.actor!=MWWorld::Class::get (actor).getId (actor)) if (info.actor!=MWWorld::Class::get (actor).getId (actor))
return false; return false;
// TODO check actor race if (!info.race.empty())
{
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *cellRef = actor.get<ESM::NPC>();
if (!cellRef)
return false;
if (info.race!=cellRef->base->race)
return false;
}
// TODO check actor class // TODO check actor class
// TODO check actor faction // TODO check actor faction
// TODO check player faction // TODO check player faction
@ -138,7 +148,6 @@ namespace MWDialogue
std::cout std::cout
<< "unchecked entries:" << std::endl << "unchecked entries:" << std::endl
<< " actor race: " << info.race << std::endl
<< " actor class: " << info.clas << std::endl << " actor class: " << info.clas << std::endl
<< " actor faction: " << info.npcFaction << std::endl << " actor faction: " << info.npcFaction << std::endl
<< " player faction: " << info.pcFaction << std::endl << " player faction: " << info.pcFaction << std::endl