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

Merge branch 'FixIssueWithTRData' into 'master'

Browse source 
Fix issue with Tamriel Data landscapes

See merge request OpenMW/openmw!1064
This commit is contained in:
psi29a 2021-07-28 10:16:55 +00:00
commit ea05b958b8
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);
} }