mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 02:15:32 +00:00
Code Issues Releases Wiki Activity

Don't add persuasion results to the journal

Browse source
This commit is contained in:
scrawl 2015-12-01 16:16:21 +01:00
parent 2327a41826
commit c912310c52
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -298,15 +298,18 @@ namespace MWDialogue
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
win->addResponse (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext), title); win->addResponse (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext), title);
// Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group, if (dialogue.mType == ESM::Dialogue::Topic)
// in which case it should not be added to the journal.
for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
iter!=dialogue.mInfo.end(); ++iter)
{ {
if (iter->mId == info->mId) // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
// in which case it should not be added to the journal.
for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
iter!=dialogue.mInfo.end(); ++iter)
{ {
MWBase::Environment::get().getJournal()->addTopic (topic, info->mId, mActor); if (iter->mId == info->mId)
break; {
MWBase::Environment::get().getJournal()->addTopic (topic, info->mId, mActor);
break;
}
} }
} }