mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-27 06:02:25 -04:00
less restrictive probes and lockpicks equipping too
This commit is contained in:
parent
d78480120d
commit
4168b6d02e
@ -146,6 +146,7 @@ namespace MWClass
|
|||||||
{
|
{
|
||||||
// Do not allow equip tools from inventory during attack
|
// Do not allow equip tools from inventory during attack
|
||||||
if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
|
if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
|
||||||
|
&& !MWBase::Environment::get().getMechanicsManager()->isCastingSpell(npc)
|
||||||
&& MWBase::Environment::get().getWindowManager()->isGuiMode())
|
&& MWBase::Environment::get().getWindowManager()->isGuiMode())
|
||||||
return { 0, "#{sCantEquipWeapWarning}" };
|
return { 0, "#{sCantEquipWeapWarning}" };
|
||||||
|
|
||||||
|
@ -144,6 +144,7 @@ namespace MWClass
|
|||||||
{
|
{
|
||||||
// Do not allow equip tools from inventory during attack
|
// Do not allow equip tools from inventory during attack
|
||||||
if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
|
if (MWBase::Environment::get().getMechanicsManager()->isAttackingOrSpell(npc)
|
||||||
|
&& !MWBase::Environment::get().getMechanicsManager()->isCastingSpell(npc)
|
||||||
&& MWBase::Environment::get().getWindowManager()->isGuiMode())
|
&& MWBase::Environment::get().getWindowManager()->isGuiMode())
|
||||||
return { 0, "#{sCantEquipWeapWarning}" };
|
return { 0, "#{sCantEquipWeapWarning}" };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user