mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-12-01 09:40:20 +01:00
commit f56debdb11
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/esm/loaddial.cpp
View File

@ -63,6 +63,8 @@ void Dialogue::readInfo(ESMReader &esm, bool merge)
std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup;
lookup = mLookup.find(id);
ESM::DialInfo info;
if (lookup != mLookup.end())
{
it = lookup->second;
@ -70,13 +72,17 @@ void Dialogue::readInfo(ESMReader &esm, bool merge)
// Merge with existing record. Only the subrecords that are present in
// the new record will be overwritten.
it->load(esm);
return;
}
info = *it;
// New record
ESM::DialInfo info;
info.mId = id;
info.load(esm);
// Since the record merging may have changed the next/prev linked list connection, we need to re-insert the record
mInfo.erase(it);
mLookup.erase(lookup);
}
else
{
info.mId = id;
info.load(esm);
}
if (info.mNext.empty())
{