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

Merge pull request #231 from OpenMW/master

Browse source 
Add OpenMW commits up to 27 Jun 2017
This commit is contained in:
David Cernat 2017-06-28 05:58:19 +03:00 committed by GitHub
commit 685bf15d52
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwdialogue/journalimp.cpp
View file

@ -103,13 +103,15 @@ namespace MWDialogue
StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor);
mJournal.push_back (entry);
Quest& quest = getQuest (id);
quest.addEntry (entry); // we are doing slicing on purpose here
MWBase::Environment::get().getWindowManager()->messageBox ("#{sJournalEntry}");
// there is no need to show empty entries in journal
if (!entry.getText().empty())
{
mJournal.push_back (entry);
MWBase::Environment::get().getWindowManager()->messageBox ("#{sJournalEntry}");
}
}
void Journal::setJournalIndex (const std::string& id, int index)