mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'enchantedimsure' into 'master'

Browse source 
Deselect magic item before selecting a spell

Closes #8162

See merge request OpenMW/openmw!4379
This commit is contained in:
jvoisin 2024-09-19 01:50:36 +00:00
commit 879c23b4cb
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwlua/magicbindings.cpp
View file

@ -744,8 +744,19 @@ namespace MWLua
const MWWorld::Ptr& ptr = obj.ptr();
auto& stats = ptr.getClass().getCreatureStats(ptr);
// We need to deselect any enchant items before we can select a spell otherwise the item will be
// reselected
const auto resetEnchantItem = [&]() {
if (ptr.getClass().hasInventoryStore(ptr))
{
MWWorld::InventoryStore& inventory = ptr.getClass().getInventoryStore(ptr);
inventory.setSelectedEnchantItem(inventory.end());
}
};
if (spellId.empty())
{
resetEnchantItem();
if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
MWBase::Environment::get().getWindowManager()->unsetSelectedSpell();
else
@ -755,6 +766,7 @@ namespace MWLua
if (!stats.getSpells().hasSpell(spellId))
throw std::runtime_error("Actor doesn't know spell " + spellId.toDebugString());
resetEnchantItem();
if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
{
int chance = MWMechanics::getSpellSuccessChance(spellId, ptr);