mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Add missing checks to see if spell still exists when loading a savegame (Bug #2883)

Browse source
This commit is contained in:
scrawl 2015-08-21 14:24:34 +02:00
parent af3b0cd883
commit 52d8bc555c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -467,7 +467,8 @@ namespace MWGui
switch (keyType)
{
case Type_Magic:
onAssignMagic(id);
if (MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id))
onAssignMagic(id);
break;
case Type_Item:
case Type_MagicItem:

4
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1686,7 +1686,9 @@ namespace MWGui
else if (type == ESM::REC_ASPL)
{
reader.getSubNameIs("ID__");
mSelectedSpell = reader.getHString();
std::string spell = reader.getHString();
if (MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spell))
mSelectedSpell = spell;
}
else if (type == ESM::REC_MARK)
{