mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 18:59:57 +00:00
Merge branch 'move360-fix-no-zoom' into 'master'
Add Camera.isZoomEnabled check to move360 zooming Closes #8064 See merge request OpenMW/openmw!4247
This commit is contained in:
commit
bfcdc16ca5
2 changed files with 3 additions and 1 deletions
|
@ -184,6 +184,7 @@
|
||||||
Bug #8005: F3 stats bars are sorted not according to their place in the timeline
|
Bug #8005: F3 stats bars are sorted not according to their place in the timeline
|
||||||
Bug #8018: Potion effects should never explode and always apply on self
|
Bug #8018: Potion effects should never explode and always apply on self
|
||||||
Bug #8021: Player's scale doesn't reset when starting a new game
|
Bug #8021: Player's scale doesn't reset when starting a new game
|
||||||
|
Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
|
||||||
Feature #1415: Infinite fall failsafe
|
Feature #1415: Infinite fall failsafe
|
||||||
Feature #2566: Handle NAM9 records for manual cell references
|
Feature #2566: Handle NAM9 records for manual cell references
|
||||||
Feature #3537: Shader-based water ripples
|
Feature #3537: Shader-based water ripples
|
||||||
|
|
|
@ -35,7 +35,8 @@ local function processZoom3rdPerson()
|
||||||
not Player.getControlSwitch(self, Player.CONTROL_SWITCH.ViewMode) or
|
not Player.getControlSwitch(self, Player.CONTROL_SWITCH.ViewMode) or
|
||||||
not Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls) or
|
not Player.getControlSwitch(self, Player.CONTROL_SWITCH.Controls) or
|
||||||
input.getBooleanActionValue('TogglePOV') or
|
input.getBooleanActionValue('TogglePOV') or
|
||||||
not I.Camera.isModeControlEnabled()
|
not I.Camera.isModeControlEnabled() or
|
||||||
|
not I.Camera.isZoomEnabled()
|
||||||
then
|
then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue