|
|
|
@ -390,7 +390,6 @@ namespace MWDialogue
|
|
|
|
|
{
|
|
|
|
|
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
|
|
|
|
|
int isRace = int(toLower(npc->base->race) == toLower(name));
|
|
|
|
|
//std::cout << "isRace"<<isRace; mEnvironment.mWorld
|
|
|
|
|
if(selectCompare<int,int>(comp,!isRace,select.i))
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
@ -523,14 +522,6 @@ namespace MWDialogue
|
|
|
|
|
if (!isMatching (actor, *iter))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/*std::cout
|
|
|
|
|
<< "unchecked entries:" << std::endl
|
|
|
|
|
<< " player faction: " << info.pcFaction << std::endl
|
|
|
|
|
<< " disposition: " << info.data.disposition << std::endl
|
|
|
|
|
<< " NPC rank: " << static_cast<int> (info.data.rank) << std::endl
|
|
|
|
|
<< " gender: " << static_cast<int> (info.data.gender) << std::endl
|
|
|
|
|
<< " PC rank: " << static_cast<int> (info.data.PCrank) << std::endl;*/
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -553,7 +544,6 @@ namespace MWDialogue
|
|
|
|
|
std::list<std::string>::iterator it;
|
|
|
|
|
for(it = actorKnownTopics.begin();it != actorKnownTopics.end();it++)
|
|
|
|
|
{
|
|
|
|
|
MWGui::DialogueWindow* win = mEnvironment.mWindowManager->getDialogueWindow();
|
|
|
|
|
size_t pos = find_str_ci(text,*it,0);
|
|
|
|
|
if(pos !=std::string::npos)
|
|
|
|
|
{
|
|
|
|
@ -574,7 +564,6 @@ namespace MWDialogue
|
|
|
|
|
{
|
|
|
|
|
mChoice = -1;
|
|
|
|
|
mIsInChoice = false;
|
|
|
|
|
std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl;
|
|
|
|
|
|
|
|
|
|
mActor = actor;
|
|
|
|
|
|
|
|
|
|