Artillery Tables - Don't block zeroing for turrets without elevationMode (#10810)

* Artillery Tables - Don't block vanilla zeroing for turrets without `elevationMode`

* Update addons/artillerytables/functions/fnc_turretPFEH.sqf

Co-authored-by: Jouni Järvinen <[email protected]>

---------

Co-authored-by: Jouni Järvinen <[email protected]>

Author: PabstMirror

addons/artillerytables/functions/fnc_turretChanged.sqf

@@ -57,13 +57,13 @@ if ((alive _player) && {_showGunLaying > 0} && {_player == gunner _vehicle}) the
     _fireModes = _fireModes apply {[getNumber (_x >> "artilleryCharge"), configName _x]};
     _fireModes sort true;
     _fireModes = _fireModes apply {_x select 1};
+    private _elevationMode = getNumber (_turretCfg >> "elevationMode");
 
-    GVAR(pfID) = [LINKFUNC(turretPFEH), 0, [_vehicle, _turret, _fireModes, _useAltElevation, _turretAnimBody, _invalidGunnerMem]] call CBA_fnc_addPerFrameHandler;
+    GVAR(pfID) = [LINKFUNC(turretPFEH), 0, [_vehicle, _turret, _fireModes, _useAltElevation, _turretAnimBody, _invalidGunnerMem, _elevationMode]] call CBA_fnc_addPerFrameHandler;
     TRACE_4("added pfEH",GVAR(pfID),_useAltElevation,_turretAnimBody,_invalidGunnerMem);
 
     #ifdef DEBUG_MODE_FULL
     private _ballisticsComputer = getNumber (configFile >> "CfgWeapons" >> _weapon >> "ballisticsComputer");
-    private _elevationMode = getNumber (_turretCfg >> "elevationMode");
     private _discreteDistance = getArray (_turretCfg >> "discreteDistance");
     TRACE_4("",_weapon,_ballisticsComputer,_elevationMode,_discreteDistance);
     #endif

addons/artillerytables/functions/fnc_turretPFEH.sqf

@@ -15,7 +15,7 @@
  * Public: No
  */
 
-(_this select 0) params ["_vehicle", "_turret", "_fireModes", "_useAltElevation", "_turretAnimBody", "_invalidGunnerMem"];
+(_this select 0) params ["_vehicle", "_turret", "_fireModes", "_useAltElevation", "_turretAnimBody", "_invalidGunnerMem", "_elevationMode"];
 
 if (shownArtilleryComputer && {GVAR(disableArtilleryComputer)}) then {
     // Still Don't like this solution, but it works
@@ -31,6 +31,16 @@ if (isNull (uiNamespace getVariable [QGVAR(display), displayNull])) then {
 
 private _ctrlGroup = (uiNamespace getVariable [QGVAR(display), displayNull]) displayCtrl 1000;
 
+if (_elevationMode == 0) then {
+    // For turrets not using an elevation mode (i.e. mouse controls elevation instead of pageUp/Down)
+    // Show the info 1 step below, so it doesn't block vanilla ranging (discreteDistance)
+    // vanilla zeroing will have a negative effect, so it's best to range as low as possible
+    private _safeZoneGrid = (((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25;
+    private _y = 3.5 * _safeZoneGrid + (profileNamespace getVariable ['IGUI_GRID_WEAPON_Y', safeZoneY + 0.5 * _safeZoneGrid]);
+    _ctrlGroup ctrlSetPositionY _y;
+    _ctrlGroup ctrlCommit 0;
+};
+
 // Need to be in gunner mode, so we can check where the optics are aiming at
 // However, if there are no optics, ignore the above
 if (!_invalidGunnerMem && {cameraView != "GUNNER"}) exitWith {