Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3

addons/common/functions/fnc_hashGet.sqf

@@ -23,4 +23,6 @@ try {
 } catch {
     HANDLECATCH;
 };
-_val
+
+if (isNil "_val") exitWith { nil };
+_val;

addons/common/functions/fnc_hashListSelect.sqf

@@ -23,4 +23,6 @@ try {
 } catch {
     HANDLECATCH;
 };
+
+if (isNil "_hash") exitWith { nil };
 _hash;

addons/interaction/XEH_postInit.sqf

@@ -51,7 +51,7 @@ private ["_team"];
     if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
 
     // Statement
-    [ACE_player, cursorTarget] call FUNC(tapShoulder);
+    [ACE_player, cursorTarget, 0] call FUNC(tapShoulder);
     true
 },
 {false},

addons/interaction/functions/fnc_tapShoulder.sqf

@@ -5,6 +5,7 @@
  * Arguments:
  * 0: Player <OBJECT>
  * 1: Target <OBJECT>
+ * 2: Shoulder which was tapped <NUMBER>
  *
  * Return value:
  * None
@@ -16,7 +17,7 @@
  */
 #include "script_component.hpp"
 
-EXPLODE_3_PVT(_this,_tapper,_target,_shoulderNum);
+PARAMS_3(_tapper,_target,_shoulderNum);
 
 if (_target != ACE_player) exitWith {
     addCamShake [4, 0.5, 5];

addons/zeus/CfgVehicles.hpp

@@ -66,7 +66,7 @@ class CfgVehicles {
     };
 
     class ModuleCurator_F: Module_F {
-        function = QUOTE(DFUNC(moduleCuratorDelay));
+        function = QUOTE(DFUNC(bi_moduleCurator));
     };
     class ModuleMine_F: ModuleEmpty_F {
         function = QUOTE(DFUNC(bi_moduleMine));

addons/zeus/functions/fnc_bi_moduleCurator.sqf

@@ -152,16 +152,6 @@ if (_activated) then {
                     _x radiochanneladd [_player];
                 } foreach (_logic getvariable ["channels",[]]);
 
-                // Added by ACE_zeus to toggle ascension messages
-                if (GVAR(zeusAscension)) then {
-                    //--- Sent notification to all assigned players
-                    {
-                        if (isplayer _x) then {
-                            [["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
-                        };
-                    } foreach (curatoreditableobjects _logic);
-                };
-
                 [_logic,"curatorUnitAssigned",[_logic,_player]] call bis_fnc_callscriptedeventhandler;
 
                 //--- Forced interface
@@ -192,16 +182,6 @@ if (_activated) then {
             };
         };
 
-        // Added by ACE_zeus to toggle eagle
-        if (GVAR(zeusBird)) then {
-            //--- Create bird
-            _birdType = _logic getvariable ["birdType","eagle_f"];
-            if (_birdType != "") then {
-                _bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
-                _logic setvariable ["bird",_bird,true];
-            };
-        };
-
         //--- Activated all future addons
         _addons = [];
         {
@@ -217,18 +197,8 @@ if (_activated) then {
         } foreach (synchronizedobjects _logic);
         _addons call bis_fnc_activateaddons;
 
-        // Added by ACE_zeus to toggle eagle
+        // Added by ACE_zeus to delay ascension messages and bird code (so that settings can be changed)
-        if (GVAR(zeusBird)) then {
+        [{_this spawn DFUNC(moduleCuratorDelay);},[_logic,_player]] call EFUNC(common,execNextFrame);
-            //--- Locality changed
-            _logic addeventhandler [
-                "local",
-                {
-                    _logic = _this select 0;
-                    _bird = _logic getvariable ["bird",objnull];
-                    _bird setowner owner _logic;
-                }
-            ];
-        };
     };
 
     //--- Player

addons/zeus/functions/fnc_moduleCuratorDelay.sqf

@@ -1,12 +1,11 @@
 /*
  * Author: SilentSpike
- * Function that delays the execution of the curator module function
+ * Function executed at a delay to allow curator settings module to run first
  * Allows ascension and bird settings to be set by module beforehand
  *
  * Arguments:
  * 0: The module logic <LOGIC>
- * 1: units <ARRAY>
+ * 1: Zeus player <OBJECT>
- * 2: activated <BOOL>
  *
  * Return Value:
  * None <NIL>
@@ -16,4 +15,39 @@
 
 #include "script_component.hpp"
 
-[{_this spawn DFUNC(bi_moduleCurator);},_this] call EFUNC(common,execNextFrame);
+if (isServer) then {
+    private ["_logic","_player","_birdType","_bird"];
+
+    _logic = _this select 0;
+    _player = _this select 1;
+
+    // Extracted from moduleCurator to toggle ascension messages
+    if (GVAR(zeusAscension)) then {
+        //--- Sent notification to all assigned players
+        {
+            if (isplayer _x) then {
+                [["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
+            };
+        } foreach (curatoreditableobjects _logic);
+    };
+
+    // Extracted from moduleCurator to toggle eagle
+    if (GVAR(zeusBird)) then {
+        //--- Create bird
+        _birdType = _logic getvariable ["birdType","eagle_f"];
+        if (_birdType != "") then {
+            _bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
+            _logic setvariable ["bird",_bird,true];
+        };
+
+        //--- Locality changed
+        _logic addeventhandler [
+            "local",
+            {
+                _logic = _this select 0;
+                _bird = _logic getvariable ["bird",objnull];
+                _bird setowner owner _logic;
+            }
+        ];
+    };
+};