detaching of terminal refinements again

gruppe-adler · Jun 2, 2019 · 81a37c9 · 81a37c9
1 parent 1259c1d
commit 81a37c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/BC_setup/functions/client/fn_addInteractions.sqf b/BC_setup/functions/client/fn_addInteractions.sqf
@@ -183,18 +183,9 @@ if (!hasInterface) exitWith {};
              {
              [4, [_this select 0], {
                 ((_this select 0) select 0) setVariable ["detachableRadio", 2, true];
-
-                  _terminal = missionNamespace getVariable ["GRAD_tracking_terminalObj", objNull];
-                  _radioVeh = missionNamespace getVariable ["GRAD_tracking_radioVehObj", objNull];
-
-                  detach _terminal;
-
-                  // safely put down
-                  _terminal setVehiclePosition [_radioVeh getRelPos [2, 180], [], 6, "NONE"];
+                  private _radioVeh = missionNamespace getVariable ["GRAD_tracking_radioVehObj", objNull];
+                  [] remoteExec ["GRAD_tracking_fnc_terminalDetach", _radioVeh];
 
-                  GRAD_TERMINAL = true; publicVariable "GRAD_TERMINAL";
-
-                  [_terminal, true, [0,1.4,0], 270] remoteExec ["ace_dragging_fnc_setDraggable", 0, true];
              }, {hint "Cancelled action"}, (localize "str_GRAD_detaching_radio")] call ace_common_fnc_progressBar;
              },
               {(side player == east) && ((_this select 0) getVariable ["detachableRadio", 0] == 1)}] call ace_interact_menu_fnc_createAction;

diff --git a/grad_tracking/cfgFunctions.hpp b/grad_tracking/cfgFunctions.hpp
@@ -52,5 +52,6 @@ class GRAD_tracking {
         class terminalDistanceListenerServer {};
         class terminalDistanceToVehCalc {};
         class terminalIsSending {};
+        class terminalDetach;
     };
 };
diff --git a/grad_tracking/functions/player/fn_terminalDetach.sqf b/grad_tracking/functions/player/fn_terminalDetach.sqf
@@ -0,0 +1,12 @@
+private _terminal = missionNamespace getVariable ["GRAD_tracking_terminalObj", objNull];
+private _radioVeh = missionNamespace getVariable ["GRAD_tracking_radioVehObj", objNull];
+
+
+detach _terminal;
+// safely put down
+_terminal setVehiclePosition [_radioVeh getRelPos [3, 180], [], 3, "NONE"];
+
+
+GRAD_TERMINAL = true; publicVariable "GRAD_TERMINAL";
+
+[_terminal, true, [0,1.4,0], 270] remoteExec ["ace_dragging_fnc_setDraggable", 0, true];