mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-03 17:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'FixUBOnDoubleMove' into 'master'

Browse Source 
Avoid double move when an area with same coordinates already exists

See merge request OpenMW/openmw!2059
This commit is contained in:
jvoisin 2022-06-27 16:28:17 +00:00
commit 3403ea1d9e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwworld/store.cpp
View File

@ -404,12 +404,15 @@ namespace MWWorld
land.load(esm, isDeleted);
// Same area defined in multiple plugins? -> last plugin wins
auto [it, inserted] = mStatic.insert(std::move(land));
if (!inserted) {
auto it = mStatic.lower_bound(land);
if (it != mStatic.end() && (std::tie(it->mX, it->mY) == std::tie(land.mX, land.mY)))
{
auto nh = mStatic.extract(it);
nh.value() = std::move(land);
mStatic.insert(std::move(nh));
}
else
mStatic.insert(it, std::move(land));
return RecordId("", isDeleted);
}