Merge pull request #3958 from acemod/fix3950

Fix freeing prisoners after they've switched locality

addons/captives/CfgEventHandlers.hpp

@@ -55,3 +55,11 @@ class Extended_Respawn_EventHandlers {
         };
     };
 };
+
+class Extended_Local_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            local = QUOTE(call FUNC(handleLocal));
+        };
+    };
+};

addons/captives/XEH_PREP.hpp

@@ -14,8 +14,11 @@ PREP(doLoadCaptive);
 PREP(doRemoveHandcuffs);
 PREP(doUnloadCaptive);
 PREP(findEmptyNonFFVCargoSeat);
+PREP(handleAnimChangedHandcuffed);
+PREP(handleAnimChangedSurrendered);
 PREP(handleGetIn);
 PREP(handleGetOut);
+PREP(handleLocal);
 PREP(handleOnUnconscious);
 PREP(handlePlayerChanged);
 PREP(handleRespawn);

addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf

@@ -0,0 +1,37 @@
+/*
+ * Author: Nic547, commy2
+ * Restart the handcuffing animation if it got interrupted. Called from a AnimChanged EH.
+ *
+ * Arguments:
+ * 0: The Unit <OBJECT>
+ * 1: New animation <STRING>
+ *
+ * ReturnValue:
+ * None
+ *
+ * Public: No
+ */
+
+
+#include "script_component.hpp"
+
+params ["_unit", "_newAnimation"];
+TRACE_2("AnimChanged",_unit,_newAnimation);
+if (_unit == (vehicle _unit)) then {
+    if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+        TRACE_1("Handcuff animation interrupted",_newAnimation);
+        [_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
+    };
+} else {
+    _turretPath = [];
+    {
+        _x params ["_xUnit", "", "", "_xTurretPath"];
+        if (_unit == _xUnit) exitWith {_turretPath = _xTurretPath};
+    } forEach (fullCrew (vehicle _unit));
+    TRACE_1("turret Path",_turretPath);
+    if (_turretPath isEqualTo []) exitWith {};
+
+    TRACE_1("Handcuff (FFV) animation interrupted",_newAnimation);
+    [_unit, "ACE_HandcuffedFFV", 2] call EFUNC(common,doAnimation);
+    [_unit, "ACE_HandcuffedFFV", 1] call EFUNC(common,doAnimation);
+};

addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf

@@ -0,0 +1,24 @@
+/*
+ * Author: Nic547, commy2
+ * Restart the surrendering animation if it got interrupted. Called from a AnimChanged EH.
+ *
+ * Arguments:
+ * 0: The Unit <OBJECT>
+ * 1: New animation <STRING>
+ *
+ * ReturnValue:
+ * None
+ *
+ * Public: No
+ */
+
+
+#include "script_component.hpp"
+
+params ["_unit", "_newAnimation"];
+
+TRACE_2("AnimChanged",_unit,_newAnimation);
+if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+    TRACE_1("Surrender animation interrupted",_newAnimation);
+    [_unit, "ACE_AmovPercMstpSsurWnonDnon", 1] call EFUNC(common,doAnimation);
+};

addons/captives/functions/fnc_handleLocal.sqf

@@ -0,0 +1,63 @@
+/*
+ * Author: esteldunedain
+ * Called when a unit switched locality
+ *
+ * Arguments:
+ * 0: The Unit <OBJECT>
+ * 1: Is local <BOOL>
+ *
+ * ReturnValue:
+ * None
+ *
+ * Public: No
+ */
+
+
+#include "script_component.hpp"
+
+params ["_unit", "_local"];
+
+// Make sure that if the unit is captive or surrendered it has a AnimChanged EH running ONLY on the machine that owns it
+if (_local) then {
+
+    // If the unit is handcuffed
+    if (_unit getVariable [QGVAR(isHandcuffed), false]) then {
+        // If the unit already has an AnimChanged EH here then there's nothing to do either
+        if (_unit getVariable [QGVAR(handcuffAnimEHID), -1] != -1) exitWith {};
+
+        // Otherwise, restart the AnimChanged EH in the new machine
+        private _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedHandcuffed)];
+        TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
+        _unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
+    };
+
+    // If the unit is surrendering
+    if (_unit getVariable [QGVAR(isSurrendering), false]) then {
+        // If the unit already has an AnimChanged EH here then there's nothing to do either
+        if (_unit getVariable [QGVAR(surrenderAnimEHID), -1] != -1) exitWith {};
+
+        // Otherwise, restart the AnimChanged EH in the new machine
+        private _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedSurrendered)];
+        TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
+        _unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
+    };
+
+} else {
+
+    private _animChangedEHID = _unit getVariable [QGVAR(handcuffAnimEHID), -1];
+    if (_animChangedEHID != -1) then {
+        // If the unit had a AnimChanged EH for handcuffing in the old machine then remove it
+        TRACE_1("Removing animChanged EH",_animChangedEHID);
+        _unit removeEventHandler ["AnimChanged", _animChangedEHID];
+        _unit setVariable [QGVAR(handcuffAnimEHID), -1];
+    };
+
+    _animChangedEHID = _unit getVariable [QGVAR(surrenderAnimEHID), -1];
+    if (_animChangedEHID != -1) then {
+        // If the unit had a AnimChanged EH for handcuffing in the old machine then remove it
+        TRACE_1("Removing animChanged EH",_animChangedEHID);
+        _unit removeEventHandler ["AnimChanged", _animChangedEHID];
+        _unit setVariable [QGVAR(surrenderAnimEHID), -1];
+    };
+
+};

addons/captives/functions/fnc_setHandcuffed.sqf

@@ -73,28 +73,7 @@ if (_state) then {
             TRACE_1("removing animChanged EH",_animChangedEHID);
             _unit removeEventHandler ["AnimChanged", _animChangedEHID];
         };
-        _animChangedEHID = _unit addEventHandler ["AnimChanged", {
+        _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedHandcuffed)];
-            params ["_unit", "_newAnimation"];
-            TRACE_2("AnimChanged",_unit,_newAnimation);
-            if (_unit == (vehicle _unit)) then {
-                if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
-                    TRACE_1("Handcuff animation interrupted",_newAnimation);
-                    [_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
-                };
-            } else {
-                _turretPath = [];
-                {
-                    _x params ["_xUnit", "", "", "_xTurretPath"];
-                    if (_unit == _xUnit) exitWith {_turretPath = _xTurretPath};
-                } forEach (fullCrew (vehicle _unit));
-                TRACE_1("turret Path",_turretPath);
-                if (_turretPath isEqualTo []) exitWith {};
-
-                TRACE_1("Handcuff (FFV) animation interrupted",_newAnimation);
-                [_unit, "ACE_HandcuffedFFV", 2] call EFUNC(common,doAnimation);
-                [_unit, "ACE_HandcuffedFFV", 1] call EFUNC(common,doAnimation);
-            };
-        }];
         TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
         _unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
 

addons/captives/functions/fnc_setSurrendered.sqf

@@ -64,13 +64,7 @@ if (_state) then {
                 TRACE_1("removing animChanged EH",_animChangedEHID);
                 _unit removeEventHandler ["AnimChanged", _animChangedEHID];
             };
-            _animChangedEHID = _unit addEventHandler ["AnimChanged", {
+            _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedSurrendered)];
-                params ["_unit", "_newAnimation"];
-                if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
-                    TRACE_1("Surrender animation interrupted",_newAnimation);
-                    [_unit, "ACE_AmovPercMstpSsurWnonDnon", 1] call EFUNC(common,doAnimation);
-                };
-            }];
             _unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
         };
     }, [_unit], 0.01] call CBA_fnc_waitAndExecute;