mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-28 12:58:00 +03:00
Merge branch 'updatespellwindowquickkey' into 'master'
Some checks failed
Build and test / Ubuntu (push) Has been cancelled
Build and test / MacOS (push) Has been cancelled
Build and test / Read .env file and expose it as output (push) Has been cancelled
Build and test / Windows (2019) (push) Has been cancelled
Build and test / Windows (2022) (push) Has been cancelled
Some checks failed
Build and test / Ubuntu (push) Has been cancelled
Build and test / MacOS (push) Has been cancelled
Build and test / Read .env file and expose it as output (push) Has been cancelled
Build and test / Windows (2019) (push) Has been cancelled
Build and test / Windows (2022) (push) Has been cancelled
Update spell window after selecting spell using quickkey #8436 See merge request OpenMW/openmw!4611
This commit is contained in:
commit
567524a98f
1 changed files with 6 additions and 0 deletions
|
@ -421,6 +421,9 @@ namespace MWGui
|
|||
}
|
||||
|
||||
store.setSelectedEnchantItem(it);
|
||||
// to reset WindowManager::mSelectedSpell immediately
|
||||
MWBase::Environment::get().getWindowManager()->setSelectedEnchantItem(*it);
|
||||
|
||||
MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Spell);
|
||||
}
|
||||
}
|
||||
|
@ -448,6 +451,9 @@ namespace MWGui
|
|||
store.unequipSlot(MWWorld::InventoryStore::Slot_CarriedRight);
|
||||
MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState::Weapon);
|
||||
}
|
||||
|
||||
// Updates the state of equipped/not equipped (skin) in spellwindow
|
||||
MWBase::Environment::get().getWindowManager()->updateSpellWindow();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue