mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 06:45:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'orphans_in_the_back' into 'master'

Browse source 
Append orphaned dialogue instead of always appending it

See merge request OpenMW/openmw!1981
This commit is contained in:
Alexei Kotov 2022-06-06 09:37:18 +00:00
commit 5f700c7e7f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/esm3/loaddial.cpp
View file

@ -102,10 +102,12 @@ namespace ESM
auto it = lookup->second.first; auto it = lookup->second.first;
mLookup[info.mId] = std::make_pair(mInfo.insert(++it, info), isDeleted); mLookup[info.mId] = std::make_pair(mInfo.insert(++it, info), isDeleted);
return;
} }
else
mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.end(), info), isDeleted);
} }
mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.begin(), info), isDeleted); else
mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.begin(), info), isDeleted);
} }
void Dialogue::clearDeletedInfos() void Dialogue::clearDeletedInfos()