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

deal with dialogue/info records that don't exist anymore

Browse source
This commit is contained in:
Marc Zinnschlag 2013-12-03 14:39:54 +01:00
parent e269c9e689
commit 34cdd2bb1f
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,22 @@ namespace MWDialogue
return iter->second; return iter->second;
} }
bool Journal::isThere (const std::string& topicId, const std::string& infoId) const
{
if (const ESM::Dialogue *dialogue =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().search (topicId))
{
if (infoId.empty())
return true;
for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
iter!=dialogue->mInfo.end(); ++iter)
if (iter->mId == infoId)
return true;
}
return false;
}
Journal::Journal() Journal::Journal()
{} {}
@ -207,30 +223,32 @@ namespace MWDialogue
ESM::JournalEntry record; ESM::JournalEntry record;
record.load (reader); record.load (reader);
switch (record.mType) if (isThere (record.mTopic, record.mInfo))
{ switch (record.mType)
case ESM::JournalEntry::Type_Quest: {
case ESM::JournalEntry::Type_Quest:
getQuest (record.mTopic).insertEntry (record); getQuest (record.mTopic).insertEntry (record);
break; break;
case ESM::JournalEntry::Type_Journal: case ESM::JournalEntry::Type_Journal:
mJournal.push_back (record); mJournal.push_back (record);
break; break;
case ESM::JournalEntry::Type_Topic: case ESM::JournalEntry::Type_Topic:
getTopic (record.mTopic).insertEntry (record); getTopic (record.mTopic).insertEntry (record);
break; break;
} }
} }
else if (type==ESM::REC_QUES) else if (type==ESM::REC_QUES)
{ {
ESM::QuestState record; ESM::QuestState record;
record.load (reader); record.load (reader);
mQuests.insert (std::make_pair (record.mTopic, record)); if (isThere (record.mTopic))
mQuests.insert (std::make_pair (record.mTopic, record));
} }
} }
} }

2
apps/openmw/mwdialogue/journalimp.hpp
View file

@ -21,6 +21,8 @@ namespace MWDialogue
Topic& getTopic (const std::string& id); Topic& getTopic (const std::string& id);
bool isThere (const std::string& topicId, const std::string& infoId = "") const;
public: public:
Journal(); Journal();