From 1bc166ebd6f9f13d9126b54d5585b532da9e2330 Mon Sep 17 00:00:00 2001
From: Stedd <toanpa+git@pm.me>
Date: Sat, 5 Nov 2022 12:38:59 +0100
Subject: [PATCH] Zoom fix v2

---
 Assets/Weapons/WeaponZoom.cs | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/Assets/Weapons/WeaponZoom.cs b/Assets/Weapons/WeaponZoom.cs
index baea279..77ae1f0 100644
--- a/Assets/Weapons/WeaponZoom.cs
+++ b/Assets/Weapons/WeaponZoom.cs
@@ -18,7 +18,7 @@ public class WeaponZoom : MonoBehaviour
     [SerializeField] private CinemachineVirtualCamera _camera;
     [SerializeField] private bool _zoomedIn;
 
-    private void OnEnable()
+    private void Awake()
     {
         _input = GetComponentInParent<StarterAssetsInputs>();
         _camera = FindObjectOfType<CinemachineVirtualCamera>();
@@ -28,7 +28,8 @@ public class WeaponZoom : MonoBehaviour
 
     private void OnDisable()
     {
-        _camera.m_Lens.FieldOfView = _fovNormal;
+        ZoomOut();
+        _zoomedIn = false;
     }
 
     private void Update()
@@ -37,13 +38,23 @@ public class WeaponZoom : MonoBehaviour
         _zoomedIn = !_zoomedIn;
         if (_zoomedIn)
         {
-            _input.MouseScale = _senseZoom;
-            _camera.m_Lens.FieldOfView = _fovZoom;
+            ZoomIn();
         }
         else
         {
-            _input.MouseScale = _senseNormal;
-            _camera.m_Lens.FieldOfView = _fovNormal;
+            ZoomOut();
         }
     }
+
+    private void ZoomOut()
+    {
+        _input.MouseScale = _senseNormal;
+        _camera.m_Lens.FieldOfView = _fovNormal;
+    }
+
+    private void ZoomIn()
+    {
+        _input.MouseScale = _senseZoom;
+        _camera.m_Lens.FieldOfView = _fovZoom;
+    }
 }
\ No newline at end of file