mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-02 06:11:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1576

Browse source
This commit is contained in:
scrawl 2017-12-04 21:19:49 +00:00
commit d2b3f902c7
No known key found for this signature in database
GPG key ID: 2E6CC3676024C402
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,7 +146,6 @@ namespace MWDialogue
// TODO play sound // TODO play sound
} }
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
callback->addResponse("", Interpreter::fixDefinesDialog(info->mResponse, interpreterContext)); callback->addResponse("", Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
executeScript (info->mResultScript, mActor); executeScript (info->mResultScript, mActor);
@ -401,8 +400,10 @@ namespace MWDialogue
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
callback->addResponse("", Interpreter::fixDefinesDialog(text, interpreterContext)); callback->addResponse("", Interpreter::fixDefinesDialog(text, interpreterContext));
if (dialogue->mType == ESM::Dialogue::Topic)
{
// Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group, // 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. // in which case it should not be added to the journal
for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue->mInfo.begin(); for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue->mInfo.begin();
iter!=dialogue->mInfo.end(); ++iter) iter!=dialogue->mInfo.end(); ++iter)
{ {
@ -412,6 +413,7 @@ namespace MWDialogue
break; break;
} }
} }
}
executeScript (info->mResultScript, mActor); executeScript (info->mResultScript, mActor);
} }

4
apps/openmw/mwgui/journalbooks.cpp
View file

@ -281,6 +281,8 @@ BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
textColours.journalTopicOver, textColours.journalTopicOver,
textColours.journalTopicPressed, first); textColours.journalTopicPressed, first);
ch[1]++;
// Words can not be started with these characters // Words can not be started with these characters
if (i == 26 || i == 28) if (i == 26 || i == 28)
continue; continue;
@ -290,8 +292,6 @@ BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
typesetter->write (style, to_utf8_span (buffer)); typesetter->write (style, to_utf8_span (buffer));
typesetter->lineBreak (); typesetter->lineBreak ();
ch[1]++;
} }
return typesetter; return typesetter;