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

Fix behavior of 'journal' command when invoked with already seen entry

Browse source
This commit is contained in:
scrawl 2017-10-22 19:30:55 +02:00
parent 768da57da2
commit 3d0094bd2e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,11 +77,15 @@ namespace MWDialogue
void Journal::addEntry (const std::string& id, int index, const MWWorld::Ptr& actor) void Journal::addEntry (const std::string& id, int index, const MWWorld::Ptr& actor)
{ {
// bail out of we already have heard this... // bail out if we already have heard this...
std::string infoId = JournalEntry::idFromIndex (id, index); std::string infoId = JournalEntry::idFromIndex (id, index);
for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i) for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i)
if (i->mTopic == id && i->mInfoId == infoId) if (i->mTopic == id && i->mInfoId == infoId)
{
setJournalIndex(id, index);
MWBase::Environment::get().getWindowManager()->messageBox ("#{sJournalEntry}");
return; return;
}
StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor); StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor);