From b0bdb8787254bc664991b2d482b7ed3706476064 Mon Sep 17 00:00:00 2001
From: mrschick <58027418+mrschick@users.noreply.github.com>
Date: Sun, 18 Aug 2024 18:03:50 +0200
Subject: [PATCH] Turn magic coefficient into a #defined value

---
 addons/scopes/functions/fnc_getCurrentZeroRange.sqf | 3 ++-
 addons/scopes/script_component.hpp                  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/scopes/functions/fnc_getCurrentZeroRange.sqf b/addons/scopes/functions/fnc_getCurrentZeroRange.sqf
index 33f437fd74..dbcfbaf6d5 100644
--- a/addons/scopes/functions/fnc_getCurrentZeroRange.sqf
+++ b/addons/scopes/functions/fnc_getCurrentZeroRange.sqf
@@ -35,9 +35,10 @@ private _opticConfig = if (_optic != "") then {
 };
 
 private _zeroRange = currentZeroing _unit;
+// Revert zeroing to default if overriding is enabled OR the selected sight's magnification is not higher than that of the naked eye, meaning that it is a secondary iron/holo sight
 if (
     (GVAR(canAdjustElevation) select _weaponIndex) && 
-    {GVAR(overwriteZeroRange) || {getNumber (_opticConfig >> "ItemInfo" >> "OpticsModes" >> (_unit getOpticsMode _weaponIndex) >> "opticsZoomMax") > 0.2}}
+    {GVAR(overwriteZeroRange) || {getNumber (_opticConfig >> "ItemInfo" >> "OpticsModes" >> (_unit getOpticsMode _weaponIndex) >> "opticsZoomMax") > MIN_ZOOM_NAKEDEYE}}
 ) then {
     _zeroRange = GVAR(defaultZeroRange);
 };
diff --git a/addons/scopes/script_component.hpp b/addons/scopes/script_component.hpp
index 9e867a9bd2..e7a9edb158 100644
--- a/addons/scopes/script_component.hpp
+++ b/addons/scopes/script_component.hpp
@@ -18,6 +18,8 @@
 
 #define DEFAULT_RAIL_BASE_ANGLE 0.0086 // deg
 
+#define MIN_ZOOM_NAKEDEYE 0.2 // Magnification (CfgWeapons opticsZoomMax) that will always be unachievable by the naked eye
+
 // #define DISABLE_DISPERSION
 
 #ifdef DEBUG_ENABLED_SCOPES