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

Merge remote branch 'gus/DialogueSystem' into dialogue

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-18 19:06:31 +01:00
commit 02e979ed4b
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,19 +318,7 @@ namespace MWDialogue
case '4'://journal case '4'://journal
if(select.type==ESM::VT_Int) if(select.type==ESM::VT_Int)
{ {
//std::cout << "vtint: " << select.i << std::endl; if(!selectCompare<int,int>(comp,mEnvironment.mJournal->getJournalIndex(name),select.i)) return false;
bool isInJournal;
if(mEnvironment.mJournal->begin()!=mEnvironment.mJournal->end())
{
for(std::deque<MWDialogue::StampedJournalEntry>::const_iterator it = mEnvironment.mJournal->begin();it!=mEnvironment.mJournal->end();it++)
{
if(it->mTopic == name) isInJournal = true;
}
}
else
isInJournal = false;
if(!selectCompare<int,int>(comp,int(isInJournal),select.i)) return false;
} }
else else
throw std::runtime_error ( throw std::runtime_error (
@ -728,7 +716,7 @@ namespace MWDialogue
for(std::list<ESM::DialInfo>::iterator it = actorKnownTopics[keyword].begin(); it != actorKnownTopics[keyword].end();it++) for(std::list<ESM::DialInfo>::iterator it = actorKnownTopics[keyword].begin(); it != actorKnownTopics[keyword].end();it++)
{ {
ESM::DialInfo dial = *it; ESM::DialInfo dial = *it;
if(functionFilter(mActor,dial,true)) if(functionFilter(mActor,dial,true) && isMatching (mActor,dial))
{ {
std::string text = it->response; std::string text = it->response;
std::string script = it->resultScript; std::string script = it->resultScript;
@ -770,7 +758,7 @@ namespace MWDialogue
for(std::list<ESM::DialInfo>::iterator it = iter; it!=actorKnownTopics[mLastTopic].begin();) for(std::list<ESM::DialInfo>::iterator it = iter; it!=actorKnownTopics[mLastTopic].begin();)
{ {
it--; it--;
if(functionFilter(mActor,*it,true)) if(functionFilter(mActor,*it,true) && isMatching (mActor,*it))
{ {
mChoiceMap.clear(); mChoiceMap.clear();
mChoice = -1; mChoice = -1;