Skip to content

Commit 35a45d2

Browse files
committed
fixed drone handler
1 parent 2b241fb commit 35a45d2

File tree

3 files changed

+40
-34
lines changed

3 files changed

+40
-34
lines changed

addons/main/functions/api/fn_send_drone_cot.sqf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
params["_drone"];
66

77
private _atak_role = "a-f-A";
8-
private _atak_callsign = [_drone] call armatak_fnc_extract_unit_callsign;
8+
private _atak_callsign = [_drone] call armatak_fnc_extract_marker_callsign;
99

1010
switch (side _drone) do {
1111
case "WEST": {
@@ -25,4 +25,10 @@ switch (side _drone) do {
2525
};
2626
};
2727

28+
_pre_defined_role = _drone getVariable "_atak_group_role";
29+
30+
if (!isNil "_pre_defined_role") then {
31+
_callsign = _pre_defined_role;
32+
};
33+
2834
_cot = [_drone, _atak_role, _atak_callsign] call armatak_fnc_send_marker_cot;

addons/server/functions/fnc_3denCoreModuleConfig.sqf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,12 @@ if (isServer) exitWith {
4949
_atak_type = [_x] call armatak_fnc_extract_role;
5050
_callsign = [_x] call armatak_fnc_extract_marker_callsign;
5151

52-
[_x, _atak_type, _callsign] call armatak_fnc_send_marker_cot;
53-
};
54-
};
55-
if (unitIsUAV _x) then {
56-
[_x] call armatak_fnc_send_drone_cot;
57-
[_x] call armatak_fnc_send_digital_pointer_cot;
52+
[_x, _atak_type, _callsign] call armatak_fnc_send_drone_cot;
53+
[_x] call armatak_fnc_send_digital_pointer_cot;
54+
};
5855
};
5956
} forEach GVAR(syncedUnits);
60-
}, 2, []] call CBA_fnc_addPerFrameHandler;
57+
}, 0.5, []] call CBA_fnc_addPerFrameHandler;
6158
};
6259

6360
true;

addons/server/functions/fnc_ZeusCoreModuleConfig.sqf

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,37 @@ _syncUnits = [];
2727

2828
missionNamespace setVariable ["armatak_server_syncedUnits", _syncUnits];
2929

30-
GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits";
31-
32-
[{
3330
GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits";
3431

35-
{
36-
_objectType = _x call BIS_fnc_objectType;
37-
switch (true) do {
38-
case ((_objectType select 0) == "Soldier"): {
39-
_callsign = [_x] call armatak_fnc_extract_unit_callsign;
40-
_group_name = [group _x] call armatak_fnc_extract_group_color;
41-
_group_role = [_x] call armatak_fnc_extract_group_role;
42-
43-
[_x, _callsign, _group_name, _group_role] call armatak_fnc_send_eud_cot;
44-
[_x] call armatak_fnc_send_digital_pointer_cot;
45-
};
46-
case ((_objectType select 0) == "Vehicle"): {
47-
_atak_type = [_x] call armatak_fnc_extract_role;
48-
_callsign = [_x] call armatak_fnc_extract_marker_callsign;
49-
50-
[_x, _atak_type, _callsign] call armatak_fnc_send_marker_cot;
32+
[{
33+
GVAR(syncedUnits) = missionNamespace getVariable "armatak_server_syncedUnits";
34+
35+
{
36+
_objectType = _x call BIS_fnc_objectType;
37+
switch (true) do {
38+
case ((_objectType select 0) == "Soldier"): {
39+
_callsign = [_x] call armatak_fnc_extract_unit_callsign;
40+
_group_name = [group _x] call armatak_fnc_extract_group_color;
41+
_group_role = [_x] call armatak_fnc_extract_group_role;
42+
43+
[_x, _callsign, _group_name, _group_role] call armatak_fnc_send_eud_cot;
44+
[_x] call armatak_fnc_send_digital_pointer_cot;
45+
};
46+
case ((_objectType select 0) == "Vehicle"): {
47+
_atak_type = [_x] call armatak_fnc_extract_role;
48+
_callsign = [_x] call armatak_fnc_extract_marker_callsign;
49+
50+
[_x, _atak_type, _callsign] call armatak_fnc_send_marker_cot;
51+
};
52+
case ((_objectType select 0) == "VehicleAutonomous"): {
53+
_atak_type = [_x] call armatak_fnc_extract_role;
54+
_callsign = [_x] call armatak_fnc_extract_marker_callsign;
55+
56+
[_x, _atak_type, _callsign] call armatak_fnc_send_drone_cot;
57+
[_x] call armatak_fnc_send_digital_pointer_cot;
58+
};
5159
};
52-
};
53-
if (unitIsUAV _x) then {
54-
[_x] call armatak_fnc_send_drone_cot;
55-
[_x] call armatak_fnc_send_digital_pointer_cot;
56-
};
57-
} forEach GVAR(syncedUnits);
58-
}, 2, []] call CBA_fnc_addPerFrameHandler;
60+
} forEach GVAR(syncedUnits);
61+
}, 2, []] call CBA_fnc_addPerFrameHandler;
5962
deleteVehicle _logic;
6063
closeDialog 1;

0 commit comments

Comments
 (0)