mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 17:42:31 +00:00
Code Issues Projects Releases Wiki Activity

If same area is defined in multiple plugin the last must wins

Browse Source
This commit is contained in:
Cédric Mocquillon 2021-07-28 10:29:16 +02:00
parent b1a3fc9399
commit c98b0f713d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,7 +431,12 @@ 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
mStatic.insert(std::move(land)); auto [it, inserted] = mStatic.insert(std::move(land));
if (!inserted) {
auto nh = mStatic.extract(it);
nh.value() = std::move(land);
mStatic.insert(std::move(nh));
}
return RecordId("", isDeleted); return RecordId("", isDeleted);
} }