diff --git a/addons/main/functions/fn_init.sqf b/addons/main/functions/fn_init.sqf index d00b4e3..848f69e 100644 --- a/addons/main/functions/fn_init.sqf +++ b/addons/main/functions/fn_init.sqf @@ -3,66 +3,69 @@ params [ ["_units", [], [[]]], ["_activated", true, [true]] ]; -if (isServer && _activated) exitWith { - private _warning = format ["ARMATAK
%1", "Connecting..."]; - [[_warning, 1.5]] call CBA_fnc_notify; - - _atak_ots_address = _logic getVariable "armatak_module_ots_api_instance_address"; - _atak_ots_protocol = _logic getVariable "armatak_module_ots_api_instance_protocol"; - _atak_ots_port = _logic getVariable "armatak_module_ots_api_instance_port"; - - _atak_ots_fulladdress = _atak_ots_protocol + ":" + "/" + "/" + _atak_ots_address + ":" + (str _atak_ots_port); - _atak_ots_api_username = _logic getVariable "armatak_module_ots_api_instance_username"; - _atak_ots_api_password = _logic getVariable "armatak_module_ots_api_instance_password"; - - missionNamespace setVariable ["_atak_server_instance", _atak_ots_fulladdress]; - missionNamespace setVariable ["_atak_server_instance_username", _atak_ots_api_username]; - missionNamespace setVariable ["_atak_server_instance_password", _atak_ots_api_password]; - - _atak_server_instance_token = call armatak_fnc_extract_auth_token; - - if (_atak_server_instance_token == "") then { - private _warning = format ["ARMATAK
%1", "Connection Failed"]; - [[_warning, 2]] call CBA_fnc_notify; - } else { - private _warning = format ["ARMATAK
%1", "Connected"]; - [[_warning, 2]] call CBA_fnc_notify; - }; - - [{ - if (isMultiplayer) then { - [{ - _markers = []; - - { - private _unit = _x; - _m = _unit call armatak_fnc_extract_info; - _markers append [_m]; - } forEach playableUnits; - { - private _unit = _x; - if (_unit getVariable "_atak_uav_connected") then { - _m = _unit call armatak_fnc_extract_drone_info; - _markers append [_m]; - }; - } forEach allUnitsUAV; - [_markers] call armatak_fnc_postMarkers; - }, 1, []] call CBA_fnc_addPerFrameHandler; +/* + if (isServer && _activated) exitWith { + private _warning = format ["ARMATAK
%1", "Connecting..."]; + [[_warning, 1.5]] call CBA_fnc_notify; + + _atak_ots_address = _logic getVariable "armatak_module_ots_api_instance_address"; + _atak_ots_protocol = _logic getVariable "armatak_module_ots_api_instance_protocol"; + _atak_ots_port = _logic getVariable "armatak_module_ots_api_instance_port"; + + _atak_ots_fulladdress = _atak_ots_protocol + ":" + "/" + "/" + _atak_ots_address + ":" + (str _atak_ots_port); + _atak_ots_api_username = _logic getVariable "armatak_module_ots_api_instance_username"; + _atak_ots_api_password = _logic getVariable "armatak_module_ots_api_instance_password"; + + missionNamespace setVariable ["_atak_server_instance", _atak_ots_fulladdress]; + missionNamespace setVariable ["_atak_server_instance_username", _atak_ots_api_username]; + missionNamespace setVariable ["_atak_server_instance_password", _atak_ots_api_password]; + + _atak_server_instance_token = call armatak_fnc_extract_auth_token; + + if (_atak_server_instance_token == "") then { + private _warning = format ["ARMATAK
%1", "Connection Failed"]; + [[_warning, 2]] call CBA_fnc_notify; } else { - [{ - _markers = []; - - _m = player call armatak_fnc_extract_info; - _markers append [_m]; - - { - if (_x getVariable "_atak_uav_connected") then { - _m = _x call armatak_fnc_extract_drone_info; - _markers append [_m]; - }; - } forEach allUnitsUAV; - [_markers] call armatak_fnc_postMarkers; - }, 1, []] call CBA_fnc_addPerFrameHandler; + private _warning = format ["ARMATAK
%1", "Connected"]; + [[_warning, 2]] call CBA_fnc_notify; }; - }, [], 1] call CBA_fnc_waitAndExecute; -}; \ No newline at end of file + + [{ + if (isMultiplayer) then { + [{ + _markers = []; + + { + private _unit = _x; + _m = _unit call armatak_fnc_extract_info; + _markers append [_m]; + } forEach playableUnits; + { + private _unit = _x; + if (_unit getVariable "_atak_uav_connected") then { + _m = _unit call armatak_fnc_extract_drone_info; + _markers append [_m]; + }; + } forEach allUnitsUAV; + [_markers] call armatak_fnc_postMarkers; + }, 1, []] call CBA_fnc_addPerFrameHandler; + } else { + [{ + _markers = []; + + _m = player call armatak_fnc_extract_info; + _markers append [_m]; + + { + if (_x getVariable "_atak_uav_connected") then { + _m = _x call armatak_fnc_extract_drone_info; + _markers append [_m]; + }; + } forEach allUnitsUAV; + [_markers] call armatak_fnc_postMarkers; + }, 1, []] call CBA_fnc_addPerFrameHandler; + }; + }, [], 1] call CBA_fnc_waitAndExecute; + }; + + */ \ No newline at end of file