mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Code Issues Releases Wiki Activity

Fix #5821: NPCs from mods getting removed if mod order was changed

Browse source
This commit is contained in:
Petr Mikheev 2021-01-29 22:53:02 +01:00
parent b286397dd4
commit 157b14cdaa
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -97,6 +97,7 @@
Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage
Bug #5758: Paralyzed actors behavior is inconsistent with vanilla Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
Bug #5762: Movement solver is insufficiently robust Bug #5762: Movement solver is insufficiently robust
Bug #5821: NPCs from mods getting removed if mod order was changed
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"
Feature #1536: Show more information about level on menu Feature #1536: Show more information about level on menu
Feature #2386: Distant Statics in the form of Object Paging Feature #2386: Distant Statics in the form of Object Paging

7
apps/openmw/mwworld/cellstore.cpp
View file

@ -921,6 +921,13 @@ namespace MWWorld
refnum.load(reader, true, "MVRF"); refnum.load(reader, true, "MVRF");
movedTo.load(reader); movedTo.load(reader);
if (refnum.hasContentFile())
{
auto iter = contentFileMap.find(refnum.mContentFile);
if (iter != contentFileMap.end())
refnum.mContentFile = iter->second;
}
// Search for the reference. It might no longer exist if its content file was removed. // Search for the reference. It might no longer exist if its content file was removed.
Ptr movedRef = searchViaRefNum(refnum); Ptr movedRef = searchViaRefNum(refnum);
if (movedRef.isEmpty()) if (movedRef.isEmpty())