Intercom - Fix infantry phone not automatically disconnected when player enters a different vehicle (#1391)

* Add debugging info

* Fix inf phone not disconnected when not on foot

* Revert changes

* Disconnect infantry phone when vehicle changes

* Revert

* Fix default

Author: Timi007

addons/sys_intercom/fnc_enterVehicle.sqf

@@ -17,7 +17,13 @@
  */
 
 params ["_vehicle", "_unit"];
-TRACE_2("enterVehicle",typeOf _vehicle,typeOf _unit);
+TRACE_2("enterVehicle",_vehicle,_unit);
+
+(_unit getVariable [QGVAR(vehicleInfantryPhone), [objNull, INTERCOM_DISCONNECTED]]) params ["_vehicleInfantryPhone", "_infantryPhoneNetwork"];
+if (!isNull _vehicleInfantryPhone) then {
+    // Disconnect infantry phone
+    [_vehicleInfantryPhone, _unit, 0, _infantryPhoneNetwork] call FUNC(updateInfantryPhoneStatus);
+};
 
 if ((_unit == _vehicle) || {GVAR(intercomPFH) > -1}) then {
     [GVAR(intercomPFH)] call CBA_fnc_removePerFrameHandler;

addons/sys_intercom/fnc_intercomPFH.sqf

@@ -36,6 +36,7 @@ for "_i" from 0 to ((count _intercoms) - 1) do {
         _connectionStatus = [_vehicle, _player, _i, INTERCOM_STATIONSTATUS_CONNECTION] call FUNC(getStationConfiguration);
     };
 
+    TRACE_4("Intercom Frame",_vehicle,_player,_infantryPhoneNetwork,_i);
     if (_player == _unitInfantryPhone && {_infantryPhoneNetwork == _i}) then {
         (_vehicle getVariable [QGVAR(infantryPhoneInfo), [[0, 0, 0], 10]]) params ["_infantryPhonePosition", "_infantryPhoneMaxDistance"];
         _infantryPhonePosition = _vehicle modelToWorld _infantryPhonePosition;

addons/sys_intercom/fnc_updateInfantryPhoneStatus.sqf

@@ -28,6 +28,7 @@ private _intercomText = format ["( %1 )", _intercomName];
 
 switch (_action) do {
     case 0: {
+        TRACE_3("Disconnect infantry phone",_vehicle,_unit,_intercomNetwork);
         // Stop using the intercom externally
         _vehicle setVariable [QGVAR(unitInfantryPhone), nil, true];
         _unit setVariable [QGVAR(vehicleInfantryPhone), nil, true];
@@ -40,6 +41,7 @@ switch (_action) do {
         [GVAR(intercomPFH)] call CBA_fnc_removePerFrameHandler;
     };
     case 1: {
+        TRACE_3("Connect infantry phone",_vehicle,_unit,_intercomNetwork);
         // Start using the intercom externally
         _vehicle setVariable [QGVAR(unitInfantryPhone), [_unit, _intercomNetwork], true];
         _unit setVariable [QGVAR(vehicleInfantryPhone), [_vehicle, _intercomNetwork], true];
@@ -51,6 +53,7 @@ switch (_action) do {
         GVAR(intercomPFH) = [DFUNC(intercomPFH), 1.1, [acre_player, _vehicle]] call CBA_fnc_addPerFrameHandler;
     };
     case 2: {
+        TRACE_4("Give infantry phone to another unit",_vehicle,_unit,_intercomNetwork,_givingUnit);
         // Give the intercom to another unit
         _givingUnit setVariable [QGVAR(vehicleInfantryPhone), nil, true];
         [GVAR(intercomPFH)] call CBA_fnc_removePerFrameHandler;
@@ -62,6 +65,7 @@ switch (_action) do {
         [QGVAR(giveInfantryPhone), [_vehicle, _unit, 1, _message, _intercomNetwork, _position], _unit] call CBA_fnc_targetEvent;
     };
     case 3: {
+        TRACE_3("Update infantry phone vars",_vehicle,_unit,_intercomNetwork);
         _vehicle setVariable [QGVAR(unitInfantryPhone), [_unit, _intercomNetwork], true];
         _unit setVariable [QGVAR(vehicleInfantryPhone), [_vehicle, _intercomNetwork], true];
     };