mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

Avoid double move when an area with same coordinates already exists

Browse source
This commit is contained in:
Cédric Mocquillon 2022-06-26 21:39:05 +02:00
parent 39d7f2c95b
commit cbf48b4382
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); land.load(esm, isDeleted);
// Same area defined in multiple plugins? -> last plugin wins // Same area defined in multiple plugins? -> last plugin wins
auto [it, inserted] = mStatic.insert(std::move(land)); auto it = mStatic.lower_bound(land);
if (!inserted) { if (it != mStatic.end() && (std::tie(it->mX, it->mY) == std::tie(land.mX, land.mY)))
{
auto nh = mStatic.extract(it); auto nh = mStatic.extract(it);
nh.value() = std::move(land); nh.value() = std::move(land);
mStatic.insert(std::move(nh)); mStatic.insert(std::move(nh));
} }
else
mStatic.insert(it, std::move(land));
return RecordId("", isDeleted); return RecordId("", isDeleted);
} }