krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix mIds mapping for dynamic records being lost on save/reload

Browse source
This commit is contained in:
scrawl 2015-01-08 16:17:13 +01:00
parent 928b9ee41b
commit d31ae2b345
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwworld/esmstore.cpp
View file

@ -192,7 +192,15 @@ void ESMStore::setUp()
case ESM::REC_LEVI:
case ESM::REC_LEVC:
mStores[type]->read (reader);
{
std::string id = reader.getHNString ("NAME");
mStores[type]->read (reader, id);
// FIXME: there might be stale dynamic IDs in mIds from an earlier savegame
// that really should be cleared instead of just overwritten
mIds[id] = type;
}
if (type==ESM::REC_NPC_)
{

6
apps/openmw/mwworld/store.hpp
View file

@ -30,7 +30,7 @@ namespace MWWorld
virtual void write (ESM::ESMWriter& writer) const {}
virtual void read (ESM::ESMReader& reader) {}
virtual void read (ESM::ESMReader& reader, const std::string& id) {}
///< Read into dynamic storage
};
@ -329,10 +329,10 @@ namespace MWWorld
}
}
void read (ESM::ESMReader& reader)
void read (ESM::ESMReader& reader, const std::string& id)
{
T record;
record.mId = reader.getHNString ("NAME");
record.mId = id;
record.load (reader);
insert (record);
}