Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn magic coefficient into a #defined value

Browse Source
This commit is contained in:
mrschick 2024-08-18 18:03:50 +02:00
parent 7911783a73
commit b0bdb87872
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/scopes/functions/fnc_getCurrentZeroRange.sqf
View File

@ -35,9 +35,10 @@ private _opticConfig = if (_optic != "") then {
}; };
private _zeroRange = currentZeroing _unit; 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 ( if (
(GVAR(canAdjustElevation) select _weaponIndex) && (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 { ) then {
_zeroRange = GVAR(defaultZeroRange); _zeroRange = GVAR(defaultZeroRange);
}; };

2
addons/scopes/script_component.hpp
View File

@ -18,6 +18,8 @@
#define DEFAULT_RAIL_BASE_ANGLE 0.0086 // deg #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 // #define DISABLE_DISPERSION
#ifdef DEBUG_ENABLED_SCOPES #ifdef DEBUG_ENABLED_SCOPES