mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 15:36:41 +00:00
Code Issues Releases Wiki Activity

on load check player record for dangling ID references

Browse source
This commit is contained in:
Marc Zinnschlag 2014-01-18 15:06:58 +01:00
parent 6584a01d01
commit 14e64c180f
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,9 +161,9 @@ void ESMStore::setUp()
mClasses.write (writer); mClasses.write (writer);
mClothes.write (writer); mClothes.write (writer);
mEnchants.write (writer); mEnchants.write (writer);
mNpcs.write (writer);
mSpells.write (writer); mSpells.write (writer);
mWeapons.write (writer); mWeapons.write (writer);
mNpcs.write (writer);
} }
bool ESMStore::readRecord (ESM::ESMReader& reader, int32_t type) bool ESMStore::readRecord (ESM::ESMReader& reader, int32_t type)
@ -176,11 +176,25 @@ void ESMStore::setUp()
case ESM::REC_CLAS: case ESM::REC_CLAS:
case ESM::REC_CLOT: case ESM::REC_CLOT:
case ESM::REC_ENCH: case ESM::REC_ENCH:
case ESM::REC_NPC_:
case ESM::REC_SPEL: case ESM::REC_SPEL:
case ESM::REC_WEAP: case ESM::REC_WEAP:
case ESM::REC_NPC_:
mStores[type]->read (reader); mStores[type]->read (reader);
if (type==ESM::REC_NPC_)
{
// NPC record will always be last and we know that there can be only one
// dynamic NPC record (player) -> We are done here with dynamic record laoding
setUp();
const ESM::NPC *player = mNpcs.find ("player");
if (!mRaces.find (player->mRace) ||
!mClasses.find (player->mClass))
throw std::runtime_error ("Invalid player record (race or class unavilable");
}
return true; return true;
default: default: