1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 05:10:26 +00:00

Merge branch 'fix_7411' into 'master'

Fix #7411 Incorrect loading of references to dynamic records from save files

Closes #7411

See merge request OpenMW/openmw!3108
This commit is contained in:
jvoisin 2023-06-06 11:48:35 +00:00
commit 36ff5d359e

View file

@ -502,6 +502,12 @@ namespace MWWorld
} }
break; break;
case ESM::REC_PLAY: case ESM::REC_PLAY:
// World::write always puts `ESM::REC_PLAY` between ESMStore (that contains dynamic records)
// and WorldModel (that can contain instances of dynamic records). Here we need to rebuild
// ESMStore index in order to be able to lookup dynamic records while loading the player and
// WorldModel.
mStore.rebuildIdsIndex();
mStore.checkPlayer(); mStore.checkPlayer();
mPlayer->readRecord(reader, type); mPlayer->readRecord(reader, type);
if (getPlayerPtr().isInCell()) if (getPlayerPtr().isInCell())