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 'planking' into 'master'

Browse source 
Only set use when holding a weapon

Closes #8232

See merge request OpenMW/openmw!4457
This commit is contained in:
psi29a 2024-11-17 14:23:18 +00:00
commit f3e829fcf2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
files/data/scripts/omw/input/playercontrols.lua
View file

@ -145,7 +145,7 @@ end
input.registerTriggerHandler('ToggleSpell', async:callback(function() input.registerTriggerHandler('ToggleSpell', async:callback(function()
if not combatAllowed() then return end if not combatAllowed() then return end
if Actor.stance(self) == Actor.STANCE.Spell then if Actor.getStance(self) == Actor.STANCE.Spell then
Actor.setStance(self, Actor.STANCE.Nothing) Actor.setStance(self, Actor.STANCE.Nothing)
elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Magic) then elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Magic) then
if checkNotWerewolf() then if checkNotWerewolf() then
@ -156,7 +156,7 @@ end))
input.registerTriggerHandler('ToggleWeapon', async:callback(function() input.registerTriggerHandler('ToggleWeapon', async:callback(function()
if not combatAllowed() then return end if not combatAllowed() then return end
if Actor.stance(self) == Actor.STANCE.Weapon then if Actor.getStance(self) == Actor.STANCE.Weapon then
Actor.setStance(self, Actor.STANCE.Nothing) Actor.setStance(self, Actor.STANCE.Nothing)
elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Fighting) then elseif Player.getControlSwitch(self, Player.CONTROL_SWITCH.Fighting) then
Actor.setStance(self, Actor.STANCE.Weapon) Actor.setStance(self, Actor.STANCE.Weapon)
@ -170,10 +170,12 @@ end))
local function processAttacking() local function processAttacking()
-- for spell-casting, set controls.use to true for exactly one frame -- for spell-casting, set controls.use to true for exactly one frame
-- otherwise spell casting is attempted every frame while Use is true -- otherwise spell casting is attempted every frame while Use is true
if Actor.stance(self) == Actor.STANCE.Spell then if Actor.getStance(self) == Actor.STANCE.Spell then
self.controls.use = startUse and 1 or 0 self.controls.use = startUse and 1 or 0
elseif Actor.getStance(self) == Actor.STANCE.Weapon and input.getBooleanActionValue('Use') then
self.controls.use = 1
else else
self.controls.use = input.getBooleanActionValue('Use') and 1 or 0 self.controls.use = 0
end end
startUse = false startUse = false
end end