Preserve PTT assignments after using remote voice radios

Previously, PTT customization would be reset after using a remote controlled AI's radios.
IDI-Systems · Nov 29, 2023 · 4c54e78 · 4c54e78
1 parent 68995eb
commit 4c54e78
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/addons/api/fnc_getMultiPushToTalkAssignment.sqf b/addons/api/fnc_getMultiPushToTalkAssignment.sqf
@@ -17,8 +17,13 @@
 
 //Emulate behaviour of the handleMultiPttKeyPress algorithm
 
-private _radioLists = [+ ACRE_ASSIGNED_PTT_RADIOS, [] call EFUNC(sys_data,getPlayerRadioList)] call EFUNC(sys_data,sortRadioList);
+private _radioLists = [];
 
+if (acre_player isEqualTo player) then { // using zeus player voice
+    _radioLists = [+ ACRE_ASSIGNED_PTT_RADIOS, [] call EFUNC(sys_data,getPlayerRadioList)] call EFUNC(sys_data,sortRadioList);
+} else { // using zeus remote voice
+    _radioLists = [+ ACRE_ASSIGNED_PTT_RADIOS_REMOTE, [] call EFUNC(sys_data,getPlayerRadioList)] call EFUNC(sys_data,sortRadioList);
+};
 
 private _returnValue = (_radioLists select 1);
 

diff --git a/addons/api/fnc_setMultiPushToTalkAssignment.sqf b/addons/api/fnc_setMultiPushToTalkAssignment.sqf
@@ -35,6 +35,10 @@ private _index = _var findIf {
 
 if (_index != -1) exitWith { false };
 
-ACRE_ASSIGNED_PTT_RADIOS = _var;
+if (acre_player isEqualTo player) then { // using zeus player voice
+    ACRE_ASSIGNED_PTT_RADIOS = _var;
+} else { // using zeus remote voice
+    ACRE_ASSIGNED_PTT_RADIOS_REMOTE = _var;
+};
 
 true
diff --git a/addons/sys_core/XEH_preInit.sqf b/addons/sys_core/XEH_preInit.sqf
@@ -66,6 +66,7 @@ DVAR(ACRE_LISTENER_DIVE) = 0;
 
 DVAR(ACRE_PTT_RELEASE_DELAY) = 0.2;
 DVAR(ACRE_ASSIGNED_PTT_RADIOS) = [];
+DVAR(ACRE_ASSIGNED_PTT_RADIOS_REMOTE) = [];
 GVAR(delayReleasePTT_Handle) = nil;
 
 DVAR(ACRE_ACTIVE_PTTKEY) = -2;

diff --git a/addons/sys_core/fnc_handleMultiPttKeyPress.sqf b/addons/sys_core/fnc_handleMultiPttKeyPress.sqf
@@ -35,11 +35,17 @@ if (ACRE_ACTIVE_PTTKEY == -2) then {
         private _radioList = [] call EFUNC(sys_data,getPlayerRadioList);
         if (ACRE_ACTIVE_PTTKEY <= (count _radioList) - 1) then {
             if ((count ACRE_ASSIGNED_PTT_RADIOS) > 0) then {
-                private _sortList = [ACRE_ASSIGNED_PTT_RADIOS, _radioList] call EFUNC(sys_data,sortRadioList);
-                // This will handle cleanup automatically too
-                ACRE_ASSIGNED_PTT_RADIOS = _sortList select 0;
-                _radioList = _sortList select 1;
-
+                if (acre_player isEqualTo player) then { // using zeus player voice
+                    private _sortList = [ACRE_ASSIGNED_PTT_RADIOS, _radioList] call EFUNC(sys_data,sortRadioList);
+                    // This will handle cleanup automatically too
+                    ACRE_ASSIGNED_PTT_RADIOS = _sortList select 0;
+                    _radioList = _sortList select 1;
+                } else {
+                    private _sortList = [ACRE_ASSIGNED_PTT_RADIOS_REMOTE, _radioList] call EFUNC(sys_data,sortRadioList);
+                    // This will handle cleanup automatically too
+                    ACRE_ASSIGNED_PTT_RADIOS_REMOTE = _sortList select 0;
+                    _radioList = _sortList select 1;
+                };
             };
             _sendRadio = _radioList select ACRE_ACTIVE_PTTKEY;
             [_sendRadio] call EFUNC(sys_radio,setActiveRadio);