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

Merge pull request #3244 from acemod/fixScopesCapturingKeys

Browse Source 
Fix ace_scopes capturing native adjustment keys for the PSO scope.
This commit is contained in:
Thomas Kooi 2016-02-04 19:58:21 +01:00
commit ce27575de3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,8 @@ _maxVertical = getArray (_opticConfig >> "ACE_ScopeAdjust_Vertical");
_maxHorizontal = getArray (_opticConfig >> "ACE_ScopeAdjust_Horizontal"); _maxHorizontal = getArray (_opticConfig >> "ACE_ScopeAdjust_Horizontal");
if ((count _maxHorizontal < 2) || (count _maxVertical < 2)) exitWith {false}; if ((count _maxHorizontal < 2) || (count _maxVertical < 2)) exitWith {false};
if ((_verticalIncrement == 0) && (_horizontalIncrement == 0)) exitWith {false}; if ((_verticalIncrement == 0) && (_turretAndDirection in [ELEVATION_UP, ELEVATION_DOWN])) exitWith {false};
if ((_horizontalIncrement == 0) && (_turretAndDirection in [WINDAGE_UP, WINDAGE_DOWN])) exitWith {false};
_zeroing = _adjustment select _weaponIndex; _zeroing = _adjustment select _weaponIndex;
_zeroing params ["_elevation", "_windage", "_zero"]; _zeroing params ["_elevation", "_windage", "_zero"];

4
optionals/compat_rhs_afrf3/CfgWeapons.hpp
View File

@ -51,13 +51,13 @@ class CfgWeapons {
class rhs_acc_pso1m2: rhs_acc_sniper_base { class rhs_acc_pso1m2: rhs_acc_sniper_base {
ACE_ScopeAdjust_Vertical[] = { 0, 0 }; ACE_ScopeAdjust_Vertical[] = { 0, 0 };
ACE_ScopeAdjust_Horizontal[] = { -10, 10 }; ACE_ScopeAdjust_Horizontal[] = { -10, 10 };
ACE_ScopeAdjust_VerticalIncrement = 0.0; ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_HorizontalIncrement = 0.5; ACE_ScopeAdjust_HorizontalIncrement = 0.5;
}; };
class rhs_acc_pso1m21: rhs_acc_sniper_base { class rhs_acc_pso1m21: rhs_acc_sniper_base {
ACE_ScopeAdjust_Vertical[] = { 0, 0 }; ACE_ScopeAdjust_Vertical[] = { 0, 0 };
ACE_ScopeAdjust_Horizontal[] = { -10, 10 }; ACE_ScopeAdjust_Horizontal[] = { -10, 10 };
ACE_ScopeAdjust_VerticalIncrement = 0.0; ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_HorizontalIncrement = 0.5; ACE_ScopeAdjust_HorizontalIncrement = 0.5;
}; };