mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 13:19:40 +00:00
Code Issues Releases Wiki Activity

Make sure birthsign spells are added when loading savegame

Browse source
This commit is contained in:
scrawl 2015-02-05 04:29:52 +01:00
parent d18d2a1882
commit 01b4177872
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwworld/player.cpp
View file

@ -260,9 +260,20 @@ namespace MWWorld
mCellStore = world.getExterior(0,0); mCellStore = world.getExterior(0,0);
} }
if (!player.mBirthsign.empty() && if (!player.mBirthsign.empty())
!world.getStore().get<ESM::BirthSign>().search (player.mBirthsign)) {
throw std::runtime_error ("invalid player state record (birthsign)"); const ESM::BirthSign* sign = world.getStore().get<ESM::BirthSign>().search (player.mBirthsign);
if (!sign)
throw std::runtime_error ("invalid player state record (birthsign does not exist)");
// To handle the case where a birth sign was edited in between play sessions (does not yet handle removing the old spells)
// Also needed for ess-imported savegames which do not specify the birtsign spells in the player's spell list.
for (std::vector<std::string>::const_iterator iter (sign->mPowers.mList.begin());
iter!=sign->mPowers.mList.end(); ++iter)
{
getPlayer().getClass().getCreatureStats(getPlayer()).getSpells().add (*iter);
}
}
mCurrentCrimeId = player.mCurrentCrimeId; mCurrentCrimeId = player.mCurrentCrimeId;
mPaidCrimeId = player.mPaidCrimeId; mPaidCrimeId = player.mPaidCrimeId;