mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Revert commit 16ac6e7aac (Fixes #3394)

Browse source
This commit is contained in:
scrawl 2016-05-15 16:28:04 +02:00
parent 62018e802b
commit 6e0c3b2413
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/esm/loaddial.cpp
View file

@ -78,13 +78,12 @@ namespace ESM
{
ESM::DialInfo info;
info.loadId(esm);
bool isDeleted = false;
info.loadData(esm, isDeleted);
if (!merge || mInfo.empty())
{
info.loadData(esm, isDeleted);
mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.end(), info), isDeleted);
return;
}
@ -96,20 +95,10 @@ namespace ESM
if (lookup != mLookup.end())
{
it = lookup->second.first;
// Merge with existing record. Only the subrecords that are present in
// the new record will be overwritten.
it->loadData(esm, isDeleted);
info = *it;
// Since the record merging may have changed the next/prev linked list connection, we need to re-insert the record
// Since the new version of this record may have changed the next/prev linked list connection, we need to re-insert the record
mInfo.erase(it);
mLookup.erase(lookup);
}
else
{
info.loadData(esm, isDeleted);
}
if (info.mNext.empty())
{