Intercom - Remove intercom PFH when ejecting from aircraft (#1076)

IDI-Systems · Mar 21, 2021 · 2d037df · 2d037df
1 parent de940bf
commit 2d037df
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/addons/sys_intercom/fnc_enterVehicle.sqf b/addons/sys_intercom/fnc_enterVehicle.sqf
@@ -17,31 +17,35 @@
  */
 
 params ["_vehicle", "_unit"];
+TRACE_2("enterVehicle",typeOf _vehicle,typeOf _unit);
 
-if (_unit != _vehicle) then {
-    // Save current seat variable
-    private _varName = [_vehicle, _unit] call FUNC(getStationVariableName);
-
-    // Save vehicle
-    _unit setVariable [QGVAR(intercomVehicle), _vehicle];
-
-    [_vehicle, _unit] call FUNC(seatSwitched);
-
-    // Start PFH
-    GVAR(intercomPFH) = [DFUNC(intercomPFH), 1, [_unit, _vehicle]] call CBA_fnc_addPerFrameHandler;
-    TRACE_1("intercom PFH",GVAR(intercomPFH));
-} else {
+if ((_unit == _vehicle) || {GVAR(intercomPFH) > -1}) then {
     [GVAR(intercomPFH)] call CBA_fnc_removePerFrameHandler;
     TRACE_1("del intercom PFH",GVAR(intercomPFH));
+    GVAR(intercomPFH) = -1;
 
-    _vehicle = _unit getVariable [QGVAR(intercomVehicle), objNull];
+    private _oldVehicle = _unit getVariable [QGVAR(intercomVehicle), objNull];
 
     // Handle the case of broadcasting or using a seat that uses limited connections
-    [_vehicle, _unit] call FUNC(seatSwitched);
+    [_oldVehicle, _unit] call FUNC(seatSwitched);
 
     // Reset variables
     _unit setVariable [QGVAR(intercomVehicle), objNull];
     _unit setVariable [QGVAR(role), ""];
     ACRE_PLAYER_INTERCOM = [];
     GVAR(intercomUse) = [];
 };
+
+if (_unit != _vehicle) then {
+    // Save current seat variable
+    private _varName = [_vehicle, _unit] call FUNC(getStationVariableName);
+
+    // Save vehicle
+    _unit setVariable [QGVAR(intercomVehicle), _vehicle];
+
+    [_vehicle, _unit] call FUNC(seatSwitched);
+
+    // Start PFH
+    GVAR(intercomPFH) = [DFUNC(intercomPFH), 1, [_unit, _vehicle]] call CBA_fnc_addPerFrameHandler;
+    TRACE_1("add intercom PFH",GVAR(intercomPFH));
+};