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

Fix journal quest logs not being marked finished when there are multiple quest IDs in the log

Browse source
This commit is contained in:
scrawl 2014-10-02 19:26:37 +02:00
parent 8dc20712de
commit 083bcaf483
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/mwgui/journalviewmodel.cpp
View file

@ -201,12 +201,23 @@ struct JournalViewModelImpl : JournalViewModel
std::set<std::string> visitedQuests; std::set<std::string> visitedQuests;
// Note that for purposes of the journal GUI, quests are identified by the name, not the ID, so several
// different quest IDs can end up in the same quest log. A quest log should be considered finished
// when any quest ID in that log is finished.
for (MWBase::Journal::TQuestIter i = journal->questBegin (); i != journal->questEnd (); ++i) for (MWBase::Journal::TQuestIter i = journal->questBegin (); i != journal->questEnd (); ++i)
{ {
if (active_only && i->second.isFinished ()) const MWDialogue::Quest& quest = i->second;
bool isFinished = false;
for (MWBase::Journal::TQuestIter j = journal->questBegin (); j != journal->questEnd (); ++j)
{
if (quest.getName() == j->second.getName() && j->second.isFinished())
isFinished = true;
}
if (active_only && isFinished)
continue; continue;
const MWDialogue::Quest& quest = i->second;
// Unfortunately Morrowind.esm has no quest names, since the quest book was added with tribunal. // Unfortunately Morrowind.esm has no quest names, since the quest book was added with tribunal.
// Note that even with Tribunal, some quests still don't have quest names. I'm assuming those are not supposed // Note that even with Tribunal, some quests still don't have quest names. I'm assuming those are not supposed
// to appear in the quest book. // to appear in the quest book.