Merge branch 'master' into pr/9217

Author: johnb432

addons/advanced_fatigue/functions/fnc_renderDebugLines.sqf

@@ -19,22 +19,22 @@ addMissionEventHandler ["Draw3D", {
     private _normal = surfaceNormal (getPosWorld ACE_player);
     private _beg = (getPosWorld ACE_player) vectorAdd (_normal vectorMultiply 0.5);
     private _end = _beg vectorAdd (_normal vectorMultiply 2);
-    drawLine3D [ASLToATL _beg, ASLToATL _end, [0, 1, 0, 1]];
+    drawLine3D [ASLToAGL _beg, ASLToAGL _end, [0, 1, 0, 1]];
 
     private _side = vectorNormalized (_normal vectorCrossProduct [0, 0, 1]);
     private _end = _beg vectorAdd (_side vectorMultiply 2);
-    drawLine3D [ASLToATL _beg, ASLToATL _end, [0, 0, 1, 1]];
+    drawLine3D [ASLToAGL _beg, ASLToAGL _end, [0, 0, 1, 1]];
 
     private _up = vectorNormalized (_normal vectorCrossProduct _side);
     private _end = _beg vectorAdd (_up vectorMultiply 2);
-    drawLine3D [ASLToATL _beg, ASLToATL _end, [1, 0, 0, 1]];
+    drawLine3D [ASLToAGL _beg, ASLToAGL _end, [1, 0, 0, 1]];
 
     private _movementVector = vectorNormalized (velocity ACE_player);
     private _end = _beg vectorAdd (_movementVector vectorMultiply 2);
-    drawLine3D [ASLToATL _beg, ASLToATL _end, [1, 1, 0, 1]];
+    drawLine3D [ASLToAGL _beg, ASLToAGL _end, [1, 1, 0, 1]];
 
     private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
     _sideVector set [2, 0];
     private _end = _beg vectorAdd (_sideVector vectorMultiply 2);
-    drawLine3D [ASLToATL _beg, ASLToATL _end, [0, 1, 1, 1]];
+    drawLine3D [ASLToAGL _beg, ASLToAGL _end, [0, 1, 1, 1]];
 }];

addons/ai/functions/fnc_drawCuratorGarrisonPathing.sqf

@@ -25,33 +25,8 @@ private _unitMoveList = missionNamespace getVariable [QGVAR(garrison_unitMoveLis
 {
     _x params  ["_unit", "_pos"];
 
-    switch (true) do {
-        case (surfaceIsWater (getPos _unit) && {surfaceIsWater _pos}) : {
-            for "_i" from 0 to 3 do {
-                drawLine3D [_unit modelToWorldVisualWorld [0,0,1], (AGLToASL _pos), [1,0,0,1]];
-            };
-            drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLToASL _pos), 0.75, 0.75, 0.75];
-        };
-
-        case (!surfaceIsWater (getPos _unit) && {!surfaceIsWater _pos}) : {
-            for "_i" from 0 to 3 do {
-                drawLine3D [_unit modelToWorldVisual [0,0,1], _pos, [1,0,0,1]];
-            };
-            drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], _pos, 0.75, 0.75, 0.75];
-        };
-
-        case (!surfaceIsWater (getPos _unit) && {surfaceIsWater _pos}) : {
-            for "_i" from 0 to 3 do {
-                drawLine3D [_unit modelToWorldVisual [0,0,1], (AGLToASL _pos), [1,0,0,1]];
-            };
-            drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLToASL _pos), 0.75, 0.75, 0.75];
-        };
-
-        case (surfaceIsWater (getPos _unit) && {!surfaceIsWater _pos}) : {
-            for "_i" from 0 to 3 do {
-                drawLine3D [_unit modelToWorldVisualWorld  [0,0,1], _pos, [1,0,0,1]];
-            };
-            drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], _pos, 0.75, 0.75, 0.75];
-        };
+    for "_i" from 0 to 3 do {
+        drawLine3D [_unit modelToWorldVisual [0,0,1], _pos, [1,0,0,1]];
     };
+    drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], _pos, 0.75, 0.75, 0.75];
 } forEach _unitMoveList;

addons/common/CfgSounds.hpp

@@ -4,4 +4,20 @@ class CfgSounds {
         sound[] = {QPATHTOF(sounds\ACE_click.wav), 1, 1, 200};
         titles[] = {};
     };
+    class ACE_Sound_Click_10db {
+        sound[] = {QPATHTOF(sounds\ACE_click.wav), "db-10", 1, 200};
+        titles[] = {};
+    };
+    class ACE_Sound_Click_20db {
+        sound[] = {QPATHTOF(sounds\ACE_click.wav), "db-20", 1, 200};
+        titles[] = {};
+    };
+    class ACE_Sound_Click_30db {
+        sound[] = {QPATHTOF(sounds\ACE_click.wav), "db-30", 1, 200};
+        titles[] = {};
+    };
+    class ACE_Sound_Click_40db {
+        sound[] = {QPATHTOF(sounds\ACE_click.wav), "db-40", 1, 200};
+        titles[] = {};
+    };
 };

addons/common/XEH_PREP.hpp

@@ -214,6 +214,7 @@ PREP(unloadPerson);
 PREP(unloadPersonLocal);
 PREP(unloadUnitWeapon);
 PREP(unmuteUnit);
+PREP(updatePlayerVehAttenuation);
 PREP(useItem);
 PREP(useMagazine);
 PREP(watchVariable);

addons/common/XEH_postInit.sqf

@@ -375,6 +375,11 @@ GVAR(OldIsCamera) = false;
     ["ace_activeCameraChanged", [_player, GVAR(OldIsCamera)]] call CBA_fnc_localEvent;
 }, true] call CBA_fnc_addPlayerEventHandler;
 
+// Update vehicle audio attenuation when player vehicle changes
+GVAR(playerVehAttenuation) = 1;
+["vehicle", LINKFUNC(updatePlayerVehAttenuation), true] call CBA_fnc_addPlayerEventHandler;
+["turret", LINKFUNC(updatePlayerVehAttenuation), false] call CBA_fnc_addPlayerEventHandler;
+
 // Add event handler for UAV control change
 ACE_controlledUAV = [objNull, objNull, [], ""];
 addMissionEventHandler ["PlayerViewChanged", {

addons/common/functions/fnc_checkFiles.sqf

@@ -230,7 +230,7 @@ if (isMultiplayer) then {
             // No need to show which addons, just show the mod that the compats are for
             if (_additionalCompats isNotEqualTo []) exitWith {
                 // Fix is easy
-                private _fixMsg = format ["Fix: %1", "Make sure your mod list matches or add those mods to the server. Check your server files and '-mod=' parameter if you're the server administrator."];
+                private _fixMsg = format ["Fix: %1", "Make sure your mod list matches or add those mods to the server.<br/><br/>If you're the server administrator, repair the mods below, check your server mod files and '-mod=' parameter."];
 
                 private _additionalMods = [];
                 private _loadedModsInfo = getLoadedModsInfo;
@@ -246,7 +246,7 @@ if (isMultiplayer) then {
                 } forEach _additionalCompats;
 
                 private _reasonMsg = format ["Reason: %1", "Client has extra mods requiring compats loaded (listed below)"];
-                private _infoMsg = format ["Additional compatibility is being loaded for: %1", _additionalMods joinString ", "];
+                private _infoMsg = format ["Additional compatibility is being loaded for:<br/>%1", _additionalMods joinString ", "];
 
                 [_title, _reasonMsg, _fixMsg, _infoMsg, _infoMsg] // return
             };

addons/common/functions/fnc_checkPBOs.sqf

@@ -38,7 +38,6 @@ if (!_checkAll) exitWith {};
 if (!isServer) then {
     ["ace_versioning_clientCheckDone", {
         // Don't let this event get triggered again
-        //IGNORE_PRIVATE_WARNING ["_thisType", "_thisId", "_thisArgs"];
         [_thisType, _thisId] call CBA_fnc_removeEventHandler;
 
         params ["_clientErrors"];

addons/common/functions/fnc_getMGRSdata.sqf

@@ -36,7 +36,7 @@ private _UTM = [_long, _lat] call BIS_fnc_posDegToUTM;
 private _easting = _UTM select 0;
 private _northing = _UTM select 1;
 //private _zone = _UTM select 2;
-TRACE_4("",_UTM,_easting,_northing,_zone);
+TRACE_3("",_UTM,_easting,_northing);
 
 /*
 private _band = switch (true) do {

addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf

@@ -16,8 +16,8 @@
  * Public: Yes
  */
 
-private _position = ATLToASL positionCameraToWorld [0, 0, 0];
-private _direction = ATLToASL positionCameraToWorld [0, 0, 1];
+private _position = AGLToASL positionCameraToWorld [0, 0, 0];
+private _direction = AGLToASL positionCameraToWorld [0, 0, 1];
 
 private _azimuth = ((_direction select 0) - (_position select 0)) atan2 ((_direction select 1) - (_position select 1));
 private _inclination = asin ((_direction select 2) - (_position select 2));

addons/common/functions/fnc_getTargetObject.sqf

@@ -17,11 +17,9 @@
 
 params ["_maxDistance"];
 
-private _position = ATLToASL positionCameraToWorld [0, 0, 0];
-_position set [2, (_position select 2) - (getTerrainHeightASL _position min 0)];
+private _position = AGLToASL positionCameraToWorld [0, 0, 0];
 
-private _laser = ATLToASL positionCameraToWorld [0, 0, _maxDistance];
-_laser set [2, (_laser select 2) - (getTerrainHeightASL _laser min 0)];
+private _laser = AGLToASL positionCameraToWorld [0, 0, _maxDistance];
 
 private _intersects = lineIntersectsObjs [_position, _laser, objNull, objNull, true, 2];