Merge pull request #4085 from acemod/apexShowHud

Update showHud setter for Squad Radar

addons/captives/functions/fnc_handlePlayerChanged.sqf

@@ -21,7 +21,7 @@ params ["_newUnit","_oldUnit"];
 //set showHUD based on new unit status:
 if ((_newUnit getVariable [QGVAR(isHandcuffed), false]) || {_newUnit getVariable [QGVAR(isSurrendering), false]}) then {
     TRACE_1("Player Change (showHUD false)",_newUnit);
-    ["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
+    ["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
 } else {
     TRACE_1("Player Change (showHUD true)",_newUnit);
     ["captive", []] call EFUNC(common,showHud); //same as showHud true;

addons/captives/functions/fnc_handleZeusDisplayChanged.sqf

@@ -19,7 +19,7 @@
 
 if ((ACE_player getVariable [QGVAR(isHandcuffed), false]) || {ACE_player getVariable [QGVAR(isSurrendering), false]}) then {
     TRACE_1("Player Change (showHUD false)",ACE_player);
-    ["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
+    ["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
 } else {
     TRACE_1("Player Change (showHUD true)",ACE_player);
     ["captive", []] call EFUNC(common,showHud); //same as showHud true;

addons/captives/functions/fnc_setHandcuffed.sqf

@@ -50,7 +50,7 @@ if (_state) then {
     _unit setVariable [QGVAR(CargoIndex), ((vehicle _unit) getCargoIndex _unit), true];
 
     if (_unit == ACE_player) then {
-        ["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
+        ["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
     };
 
     // fix anim on mission start (should work on dedicated servers)

addons/captives/functions/fnc_setSurrendered.sqf

@@ -47,7 +47,7 @@ if (_state) then {
     [_unit, "setCaptive", QGVAR(Surrendered), true] call EFUNC(common,statusEffect_set);
 
     if (_unit == ACE_player) then {
-        ["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
+        ["captive", [false, false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
     };
 
     [_unit] call EFUNC(common,fixLoweredRifleAnimation);

addons/common/functions/fnc_showHud.sqf

@@ -15,6 +15,7 @@
  * - menu: Boolean - show commanding menu (hides HC related menus)
  * - group: Boolean - show group info bar (hides squad leader info bar)
  * - cursors: Boolean - show HUD weapon cursors (connected with scripted HUD)
+ * - squadRadar: Boolean - show HUD squad radar (since 1.62)
  *
  * Return Value:
  * Resulting ShowHud Array <ARRAY>
@@ -29,7 +30,12 @@
 
 if (!hasInterface) exitWith {[-1]};
 
-params [["_reason", "", [""]], ["_mask", [], [[]], [0,8]]];
+params [["_reason", "", [""]], ["_mask", [], [[]], [0,8,9]]];
+
+if ((count _mask) == 8) then {
+    ACE_LOGWARNING_1("ace_common_fnc_showHud - mask now takes 9 arguments in 1.62 [called with %1]",_this);
+    _mask pushBack true;
+};
 
 if (isArray (missionConfigFile >> "showHUD")) then {
     //(showHud = 0;) is fine - the array is the problem
@@ -50,7 +56,7 @@ if (_reason != "") then {
 GVAR(showHudHash) params ["", "_reasons", "_masks"];
 private _resultMask = [];
 
-for "_index" from 0 to 7 do {
+for "_index" from 0 to 8 do {
     private _set = true; //Default to true
     {
         if (!(_x select _index)) exitWith {

addons/ui/ACE_Settings.hpp

@@ -43,6 +43,13 @@ class ACE_Settings {
         value = 0;
         isClientSettable = 1;
     };
+    class GVAR(squadRadar) {
+        category = CSTRING(Category);
+        displayName = CSTRING(SquadRadar);
+        typeName = "BOOL";
+        value = 1;
+        isClientSettable = 1;
+    };
 
 // ADVANCED
     // Soldier

addons/ui/CfgVehicles.hpp

@@ -42,6 +42,11 @@ class CfgVehicles {
                 typeName = "BOOL";
                 defaultValue = 0;
             };
+            class squadRadar {
+                displayName = CSTRING(SquadRadar);
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
 
             // ADVANCED
             // Soldier

addons/ui/functions/fnc_moduleInit.sqf

@@ -30,6 +30,7 @@ if (isArray (missionConfigFile >> "showHUD")) then {
     [_logic, QGVAR(vehicleCompass), "vehicleCompass"] call EFUNC(common,readSettingFromModule);
     [_logic, QGVAR(commandMenu), "commandMenu"] call EFUNC(common,readSettingFromModule);
     [_logic, QGVAR(groupBar), "groupBar"] call EFUNC(common,readSettingFromModule);
+    [_logic, QGVAR(squadRadar), "squadRadar"] call EFUNC(common,readSettingFromModule);
 };
 
 // Advanced

addons/ui/functions/fnc_setElements.sqf

@@ -31,5 +31,6 @@ if (isArray (missionConfigFile >> "showHUD")) exitWith {
     true,
     GVAR(commandMenu),
     GVAR(groupBar),
-    true
+    true,
+    GVAR(squadRadar)
 ]] call EFUNC(common,showHud);

addons/ui/script_component.hpp

@@ -19,7 +19,7 @@
 
 
 // Basic Elements
-#define ELEMENTS_BASIC [QGVAR(soldierVehicleWeaponInfo), QGVAR(vehicleRadar), QGVAR(vehicleCompass), QGVAR(commandMenu), QGVAR(groupBar)]
+#define ELEMENTS_BASIC [QGVAR(soldierVehicleWeaponInfo), QGVAR(vehicleRadar), QGVAR(vehicleCompass), QGVAR(commandMenu), QGVAR(groupBar), QGVAR(squadRadar)]
 
 // Locations
 #define ANYWHERE 0

addons/ui/stringtable.xml

@@ -90,6 +90,9 @@
             <Japanese>指揮メニュー</Japanese>
             <Polish>Pasek grupy</Polish>
         </Key>
+        <Key ID="STR_ACE_UI_SquadRadar">
+            <English>Squad Radar</English>
+        </Key>
         <Key ID="STR_ACE_UI_WeaponName">
             <English>Weapon Name</English>
             <Czech>Název zbraně</Czech>