1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 06:36:39 +00:00

Merge branch 'playercontrols' into 'master'

Remove duplicate ToggleWeapon trigger handler registration

See merge request OpenMW/openmw!3705
This commit is contained in:
uramer 2023-12-30 08:11:38 +00:00
commit c23858bf1c

View file

@ -208,16 +208,6 @@ end
local uiControlsOverridden = false
input.registerTriggerHandler('ToggleWeapon', async:callback(function()
if not combatAllowed() then return end
if Actor.stance(self) == Actor.STANCE.Weapon then
Actor.setStance(self, Actor.STANCE.Nothing)
elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Fighting) then
Actor.setStance(self, Actor.STANCE.Weapon)
end
end))
local function uiAllowed()
return Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls) and not uiControlsOverridden
end