Merge pull request #121 from Cyruz143/macro-fixes

Fix Macros

addons/ace_medical/functions/fnc_medicalMessages.sqf

@@ -5,10 +5,10 @@
 
     if (!alive _target) exitWith {
         if (group _target isEqualTo grpNull) then {
-            LOG_2("[ARK] %1 - ace_treatmentSucceded, Unit (%2) had no group",COMPONENT,_target);
+            LOG_1("ace_treatmentSucceded, Unit (%1) had no group",_target);
         } else {
             [_target] joinSilent grpNull;
-            LOG_3("[ARK] %1 -  ace_treatmentSucceded, Removed unit (%2) from group (%3)",COMPONENT,_target,group _target);
+            LOG_2(" ace_treatmentSucceded, Removed unit (%1) from group (%2)",_target,group _target);
         };
     };
 

addons/ace_medical/functions/fnc_tvtVestSwitch.sqf

@@ -11,9 +11,9 @@ ark_ace_medical_fnc_tvtVestSwitch = {
     if (isClass (configFile >> "CfgWeapons" >> _newClass)) then {
         [_loadout, [4,0], _newClass] call BIS_fnc_setNestedElement;
         _unit setUnitLoadout _loadout;
-        LOG_2("[ARK] %1 - fnc_tvtVestSwitch, Players vest replaced with %2",COMPONENT,_newClass);
+        LOG_1("fnc_tvtVestSwitch, Players vest replaced with %1",_newClass);
     } else {
-        ERROR_2("[ARK] %1 - fnc_tvtVestSwitch, Invalid classname (%2) was returned",COMPONENT,_newClass);
+        ERROR_1("fnc_tvtVestSwitch, Invalid classname (%1) was returned",_newClass);
     };
 };
 

addons/ace_rearm/server_preinit.sqf

@@ -4,21 +4,21 @@ ark_ace_rearm_fnc_makeSource = {
     params ["_vehicle"];
 
     [_vehicle, 9999] call ace_rearm_fnc_makeSource;
-    INFO_2("[ARK] %1 - fnc_enableRearm, Rearm enabled for %2",COMPONENT,_vehicle);
+    INFO_1("fnc_enableRearm, Rearm enabled for %1",_vehicle);
 };
 
 ark_ace_rearm_fnc_enableRearm = {
     params ["_logic","_vehicles"];
 
     if (_vehicles isEqualTo []) exitWith {
-        ERROR_2("[ARK] %1 - fnc_enableRearm, Module (%2) is not sync'd to any vehicle",COMPONENT,_logic);
+        ERROR_1("fnc_enableRearm, Module (%1) is not sync'd to any vehicle",_logic);
     };
 
     {
         _x call ark_ace_rearm_fnc_makeSource;
     } forEach _vehicles;
 
-    INFO_2("[ARK] %1 - fnc_enableRearm, Deleting Module (%2)",COMPONENT,_logic);
+    INFO_1("fnc_enableRearm, Deleting Module (%1)",_logic);
     deleteVehicle _logic;
 
     //Return true because spawnd from module

addons/admin_tools/functions/fnc_chaseAI.sqf

@@ -4,7 +4,7 @@ ark_admin_tools_fnc_chaseAI = {
     params [["_pos",[0,0,0]],["_dist",250],["_tp",false]];
 
     if (_pos isEqualTo [0,0,0]) exitWith {
-        INFO_1("[ARK] %1 - fnc_chaseAI, Invalid or No position passed.",COMPONENT);
+        INFO("fnc_chaseAI, Invalid or No position passed.");
     };
 
     private _closeUnits = allUnits select {
@@ -47,5 +47,5 @@ ark_admin_tools_fnc_chaseAI = {
         _unit doMove _targetPos;
     } forEach _closeUnits;
 
-    INFO_4("[ARK] %1 - fnc_chaseAI, Chase AI executed with Args: %2, %3, %4",COMPONENT,_pos,_dist,_tp);
+    INFO_3("fnc_chaseAI, Chase AI executed with Args: %1, %2, %3",_pos,_dist,_tp);
 };

addons/ai_sentry/server_preinit.sqf

@@ -40,7 +40,7 @@ ark_ai_sentry_fnc_makeSentry = {
     params ["_logic", "_units"];
 
     if (_units isEqualTo []) exitWith {
-        ERROR_2("[ARK] %1 - fnc_makeSentry, Module (%2) is not sync'd to any units.",COMPONENT,_logic);
+        ERROR_1("fnc_makeSentry, Module (%1) is not sync'd to any units.",_logic);
     };
 
     private _enabledNightvision = _logic getVariable ["Enabled_Nightvision", true];
@@ -49,7 +49,7 @@ ark_ai_sentry_fnc_makeSentry = {
         [_x, _enabledNightvision] call ark_ai_sentry_fnc_make_sentry;
     } forEach _units;
 
-    INFO_2("[ARK] %1 - fnc_makeSentry, Deleting Module (%2)",COMPONENT,_logic);
+    INFO_1("fnc_makeSentry, Deleting Module (%1)",_logic);
     deleteVehicle _logic;
 
     //Return true because spawnd from module

addons/ai_vehicles/server_postinit.sqf

@@ -18,7 +18,7 @@ ark_ai_vehicles_fnc_canRepair = {
     params ["_vehicle"];
 
     if (_vehicle getVariable ["ark_ai_vehicles_gunner_dead", false]) exitWith {
-        INFO_1("[ARK] %1 - fnc_canRepair, Aborting repair due to the gunners death.",COMPONENT);
+        INFO("fnc_canRepair, Aborting repair due to the gunners death.");
     };
 
     _vehicle setVariable ["ark_ai_vehicles_awaiting_repair", true];

addons/ai_voices/functions/fnc_selectSound.sqf

@@ -67,7 +67,7 @@ ark_ai_voices_fnc_selectSound = {
     if (isNil "_soundPathArr") then {
         private _dirPath = (getArray (configFile >> "CfgVoice" >> _speaker >> "directories")) #0;
         if (_dirPath isEqualTo "") exitWith {
-            ERROR_2("[ARK] %1 - fnc_selectSound, No directory path for sounds for %2",COMPONENT,_speaker);
+            ERROR_1("fnc_selectSound, No directory path for sounds for %1",_speaker);
             _unit setVariable ["ark_ai_voices_var_disableVoice", true];
         };
 
@@ -80,7 +80,7 @@ ark_ai_voices_fnc_selectSound = {
 
         // If it's still empty, unit has fucked config
         if (_protocolArr isEqualTo []) exitWith {
-            ERROR_3("[ARK] %1 - fnc_selectSound, No protocol path sound files available for %2, %3",COMPONENT,_speaker,_voiceline);
+            ERROR_2("fnc_selectSound, No protocol path sound files available for %1, %2",_speaker,_voiceline);
             _unit setVariable ["ark_ai_voices_var_disableVoice", true];
         };
 
@@ -94,7 +94,7 @@ ark_ai_voices_fnc_selectSound = {
     };
 
     if (isNil "_soundPathArr" || { _soundPathArr isEqualTo [] }) exitWith {
-        ERROR_2("[ARK] %1 - fnc_selectSound, No sound file to play for unit (%2)",COMPONENT,_unit);
+        ERROR_1("fnc_selectSound, No sound file to play for unit (%1)",_unit);
         _unit setVariable ["ark_ai_voices_var_disableVoice", true];
     };
 

addons/building_cleaner/server_postinit.sqf

@@ -25,7 +25,7 @@ ark_building_cleaner_fnc_canClean = {
             {_x call ark_building_cleaner_fnc_doClean} forEach _fObjs;
         };
 
-        INFO_2("[ARK] %1 - fnc_canClean, Running for %2",COMPONENT,_buildingOld);
+        INFO_1("fnc_canClean, Running for %1",_buildingOld);
     };
 };
 

addons/chase_ai/functions/fnc_enableSpawning.sqf

@@ -4,7 +4,7 @@ ark_chase_ai_fnc_enableSpawning = {
     params ["_enabled"];
 
     if (_enabled && { ark_chase_ai_var_spawning }) exitWith {
-        ERROR_1("[ARK] %1 - fnc_enableSpawning, You tried to enable spawning while it was already enabled.",COMPONENT);
+        ERROR("fnc_enableSpawning, You tried to enable spawning while it was already enabled.");
     };
 
     ark_chase_ai_var_spawning = _enabled;

addons/chase_ai/functions/fnc_init.sqf

@@ -5,32 +5,32 @@ ark_chase_ai_fnc_init = {
 
     private _syncdTrg = synchronizedObjects _logic;
     if (_syncdTrg isEqualTo []) exitWith {
-        ERROR_1("[ARK] %1 - fnc_init, Trigger not sync'd to the module.",COMPONENT);
+        ERROR("fnc_init, Trigger not sync'd to the module.");
     };
 
     if (count _syncdTrg > 1) then {
-        WARNING_1("[ARK] %1 - fnc_init, Only sync one trigger to the module",COMPONENT);
+        WARNING("fnc_init, Only sync one trigger to the module");
     };
 
     private _unitTemplate = _logic getVariable ["Unit_Template", "ADMIRAL"];
     if (_unitTemplate isEqualTo "") exitWith {
-        ERROR_1("[ARK] %1 - fnc_init, Blank unit template provided!",COMPONENT);
+        ERROR("fnc_init, Blank unit template provided!");
     };
     if (_unitTemplate isEqualTo "ADMIRAL") then {
         _unitTemplate = adm_camp_defaultUnitTemplate;
-        INFO_2("[ARK] %1 - fnc_init, Using default unit template (%2)",COMPONENT,_unitTemplate);
+        INFO_1("fnc_init, Using default unit template (%1)",_unitTemplate);
     };
 
     private _unitClassNames = _logic getVariable ["Unit_Classnames", "[ADMIRAL]"];
     if (_unitClassNames isEqualTo "[ADMIRAL]") then {
         _unitClassNames = [_unitTemplate, "infantry"] call adm_common_fnc_getUnitTemplateArray;
-        INFO_2("[ARK] %1 - fnc_init, Using default unit classnames (%2)",COMPONENT,_unitClassNames);
+        INFO_1("fnc_init, Using default unit classnames (%1)",_unitClassNames);
     } else {
         _unitClassNames = call compile (_unitClassNames);
         if (!((typeName _unitClassNames) isEqualTo "ARRAY")) exitWith {
             ["Chase AI","ERROR","fnc_init","Improper classname formatting provided, must be an ARRAY!",_unitClassNames] call ark_chase_ai_fnc_log;
         };
-        INFO_2("[ARK] %1 - fnc_init, Using custom unit classnames (%2)",COMPONENT,_unitClassNames);
+        INFO_1("fnc_init, Using custom unit classnames (%1)",_unitClassNames);
     };
 
     ark_chase_ai_var_triggerArea = _syncdTrg #0;
@@ -50,7 +50,7 @@ ark_chase_ai_fnc_init = {
     ark_chase_ai_var_spawning = false;
     ark_chase_ai_var_compatFlashlights = createHashMap;
 
-    INFO_2("[ARK] %1 - fnc_init, Deleting Module %2",COMPONENT,_logic);
+    INFO_1("fnc_init, Deleting Module %1",_logic);
     deleteVehicle _logic;
 };
 

addons/chase_ai/functions/fnc_module.sqf

@@ -6,7 +6,7 @@ ark_chase_ai_module_preinit = {
     isNil {
         if (_activated) then {
             if (_logic getVariable ["ark_chase_ai_var_moduleRan", false]) exitWith {
-                ERROR_2("[ARK] %1 - fnc_module, Module (%2) tried to execute multiple times.",COMPONENT,_logic);
+                ERROR_1("fnc_module, Module (%1) tried to execute multiple times.",_logic);
             };
 
             _logic setVariable ["ark_chase_ai_var_moduleRan", _activated];

addons/chase_ai/functions/fnc_unitSpawner.sqf

@@ -9,7 +9,7 @@ ark_chase_ai_fnc_unitSpawner = {
                 private _unit = call ark_chase_ai_fnc_createUnit;
                 if (isNil "_unit") exitWith {
                     if (missionNamespace getVariable ["ark_chase_ai_var_allowLogging", true]) then {
-                        INFO_1("[ARK] %1 - fnc_unitSpawner, No players available alive or in the AO",COMPONENT);
+                        INFO("fnc_unitSpawner, No players available alive or in the AO");
                         missionNamespace setVariable ["ark_chase_ai_var_allowLogging", false, false];
                     };
                 };

addons/clear_cargo/server_preinit.sqf

@@ -13,14 +13,14 @@ ark_clear_cargo_fnc_clearVehicle = {
     params ["_logic","_units"];
 
     if (_units isEqualTo []) exitWith {
-        ERROR_2("[ARK] %1 - fnc_clearVehicle, Module (%2) not sync'd to any vehicle",COMPONENT,_logic);
+        ERROR_1("fnc_clearVehicle, Module (%1) not sync'd to any vehicle",_logic);
     };
 
     {
         [_x] call ark_clear_cargo_fnc_doClearVehicle;
     } forEach _units;
 
-    INFO_2("[ARK] %1 - fnc_clearVehicle, Deleting Module (%2)",COMPONENT,_logic);
+    INFO_1("fnc_clearVehicle, Deleting Module (%1)",_logic);
     deleteVehicle _logic;
 
     //Return true because spawnd from module

addons/player_paradrop/server_preinit.sqf

@@ -7,8 +7,8 @@ ark_player_paradrop_fnc_init = {
     missionNamespace setVariable ["ark_player_paradrop_var_jumpHeight", (_logic getVariable ["Chute_Height", 200]), true];
     missionNamespace setVariable ["ark_player_paradrop_var_jumpGap", (_logic getVariable ["Jump_Gap", 1]), true];
 
-    INFO_1("[ARK] %1 - fnc_init, Player paradrop system is enabled",COMPONENT);
-    INFO_2("[ARK] %1 - fnc_init, Deleting Module (%2)",COMPONENT,_logic);
+    INFO("fnc_init, Player paradrop system is enabled");
+    INFO_1("fnc_init, Deleting Module (%1)",_logic);
     deleteVehicle _logic;
 
     //Return true because spawnd from module

addons/race/functions/client_functions.sqf

@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 
 ark_race_fnc_clientInit = {
-    INFO_1("[ARK] %1 - fnc_clientInit, Race Mission Detected",COMPONENT);
+    INFO("fnc_clientInit, Race Mission Detected");
     //Disable damage for vehicles and units
     player addEventHandler ["GetInMan", {call ark_race_fnc_noDamage}];
     player addEventHandler ["GetOutMan", {call ark_race_fnc_noDamage}];

addons/race/functions/server_functions.sqf

@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 
 ark_race_fnc_serverInit = {
-    INFO_1("[ARK] %1 - fnc_serverInit, Race Mission Detected",COMPONENT);
+    INFO("fnc_serverInit, Race Mission Detected");
     [{
         [nil, nil, nil, ['confirm']] call compileScript ['x\ark\addons\hull3\mission_host_safetytimer_stop.sqf'];
     }, [], 30] call CBA_fnc_waitAndExecute;

addons/rotor/functions/barrelbomb_functions.sqf

@@ -54,7 +54,7 @@ ark_rotor_fnc_dropBombs = {
             _args params ["_vehicle","_pilot"];
 
             if (_vehicle getVariable ["ark_rotor_var_bombAmount", 0] < 1 || {!alive _pilot} || {!alive _vehicle}) exitWith {
-                INFO_1("[ARK] %1 - fnc_dropBombs, All Bombs Dropped",COMPONENT);
+                INFO("fnc_dropBombs, All Bombs Dropped");
                 _vehicle forceSpeed -1;
                 (group _pilot) setCurrentWaypoint [(group _pilot), 3];
                  _vehicle setVariable ["ark_rotor_var_bombAmount", nil];

addons/rotor/functions/common_functions.sqf

@@ -5,11 +5,11 @@ ark_rotor_fnc_checkTrigger = {
 
     private _syncdTrg = synchronizedObjects _logic;
     if (_syncdTrg isEqualTo []) exitWith {
-        ERROR_1("[ARK] %1 - fnc_checkTrigger, Trigger not sync'd to the module",COMPONENT);
+        ERROR("fnc_checkTrigger, Trigger not sync'd to the module");
     };
 
     if (count _syncdTrg > 1) then {
-        WARNING_1("[ARK] %1 - fnc_checkTrigger, Only sync one trigger to the module",COMPONENT);
+        WARNING("fnc_checkTrigger, Only sync one trigger to the module");
     };
 
     private _trigger = _syncdTrg #0;
@@ -22,45 +22,45 @@ ark_rotor_fnc_checkTrigger = {
     } forEach synchronizedObjects _trigger;
 
     if (count _syncUnits > 1) then {
-       WARNING_1("[ARK] %1 - fnc_checkTrigger, Only sync one VR entity to the trigger",COMPONENT);
+       WARNING("fnc_checkTrigger, Only sync one VR entity to the trigger");
     };
 
     private _vrUnit = _syncUnits #0;
 
     if (isNil "_vrUnit") exitWith {
-        ERROR_2("[ARK] %1 - fnc_checkTrigger, No VR Entity sync'd with trigger (%2)",COMPONENT,_trigger);
+        ERROR_1("fnc_checkTrigger, No VR Entity sync'd with trigger (%1)",_trigger);
     };
 
     private _waypoints = waypoints (group _vrUnit);
     if (count _waypoints < 3) exitWith {
 
-        ERROR_2("[ARK] %1 - fnc_checkTrigger, VR Entity (%2) needs minimum of 2 waypoints",COMPONENT,_vrUnit);
+        ERROR_1("fnc_checkTrigger, VR Entity (%1) needs minimum of 2 waypoints",_vrUnit);
     };
 
     deleteVehicle _vrUnit;
-    INFO_2("[ARK] %1 - fnc_checkTrigger, VR Entity Deleted (%2)",COMPONENT,_vrUnit);
+    INFO_1("fnc_checkTrigger, VR Entity Deleted (%1)",_vrUnit);
     private _unitTemplate = adm_camp_defaultUnitTemplate;
     private _vehicleClassname = _logic getVariable ["Vehicle_ClassName", "Default"];
 
     if (_vehicleClassname isEqualTo "Default") then {
         private _heloArray = [_unitTemplate, "th"] call adm_common_fnc_getUnitTemplateArray;
         if (isNil "_heloArray" || { _heloArray isEqualTo [] }) exitWith {
-            ERROR_1("[ARK] %1 - fnc_checkTrigger, No Helicopter defined in Admiral Template",COMPONENT);
+            ERROR("fnc_checkTrigger, No Helicopter defined in Admiral Template");
         };
         _vehicleClassname = selectRandom _heloArray;
     };
 
     private _routineFunction = _logic getVariable ["Routine_Function", {ark_rotor_fnc_paradrop}];
 
-    INFO_7("[ARK] %1 - fnc_checkTrigger, Compiled Rotor routine: %2, %3, %4, %5, %6, %7",COMPONENT,_logic,_trigger,_vehicleClassname,_unitTemplate,_waypoints,_routineFunction);
+    INFO_6("fnc_checkTrigger, Compiled Rotor routine: %1, %2, %3, %4, %5, %6",_logic,_trigger,_vehicleClassname,_unitTemplate,_waypoints,_routineFunction);
     [_logic, _trigger, _vehicleClassname, _unitTemplate, _waypoints] call (call compile _routineFunction);
 };
 
 ark_rotor_fnc_createVehicle = {
     params ["_vehicleClassname", "_trigger", "_logic"];
 
     if (isNil "_trigger") exitWith {
-        ERROR_2("[ARK] %1 - fnc_createVehicle, No trigger was provided to try and spawn the vehicle with classname %2",COMPONENT,_vehicleClassname);
+        ERROR_1("fnc_createVehicle, No trigger was provided to try and spawn the vehicle with classname %1",_vehicleClassname);
     };
 
     private _flyHeight = _logic getVariable ["Fly_Height", 200];
@@ -110,12 +110,12 @@ ark_rotor_fnc_createCargo = {
             _args params ["_vehicle","_adjSeats","_grp","_cargoClassnames","_skillArray","_parachute"];
 
             if (isNil "_vehicle" || { !alive _vehicle }) exitWith {
-                ERROR_1("[ARK] %1 - fnc_createCargo, Vehicle is dead or has incorrect classname",COMPONENT);
+                ERROR("fnc_createCargo, Vehicle is dead or has incorrect classname");
                 _id call CBA_fnc_removePerFrameHandler;
             };
 
             if (count (crew _vehicle) >= _adjSeats) exitWith {
-                INFO_2("[ARK] %1 - fnc_createCargo, Delayed spawning completed. Spawned total units (%2)",COMPONENT,_adjSeats);
+                INFO_1("fnc_createCargo, Delayed spawning completed. Spawned total units (%1)",_adjSeats);
                 _id call CBA_fnc_removePerFrameHandler;
             };
 
@@ -160,15 +160,15 @@ ark_rotor_fnc_taskAttack = {
     } forEach ((playableUnits + switchableUnits) select {isPlayer _x && {!(_x isKindOf "HeadlessClient_F")}});
 
     if (_nearEnemies isEqualTo []) exitWith {
-        INFO_1("[ARK] %1 - fnc_taskAttack, No players to attack",COMPONENT);
+        INFO("fnc_taskAttack, No players to attack");
         {deleteVehicle _x} forEach units _grp;
     };
 
     _nearEnemies sort true;
     private _target = _nearEnemies #0;
 
     [_grp, getPos _target, 100] call CBA_fnc_taskPatrol;
-    INFO_2("[ARK] %1 - fnc_taskAttack, Units attacking player (%2)",COMPONENT,_target);
+    INFO_1("fnc_taskAttack, Units attacking player (%1)",_target);
 };
 
 ark_rotor_fnc_cleanUp = {
@@ -179,9 +179,9 @@ ark_rotor_fnc_cleanUp = {
     if ((_crew select {isPlayer _x}) isEqualTo []) then {
         deleteVehicleCrew _vehicle;
         {deleteVehicle _x} forEach [_vehicle,_logic];
-        INFO_2("[ARK] %1 - fnc_cleanUp, Cleaned up Vehicle (%2)",COMPONENT,_vehicle);
+        INFO_1("fnc_cleanUp, Cleaned up Vehicle (%1)",_vehicle);
     } else {
         deleteVehicle _logic;
-        INFO_1("[ARK] %1 - fnc_cleanUp, Not removing vehicle as player crew was detected",COMPONENT);
+        INFO("fnc_cleanUp, Not removing vehicle as player crew was detected");
     };
 };

addons/rotor/functions/insert_functions.sqf

@@ -62,7 +62,7 @@ ark_rotor_fnc_emtpyCargo = {
             private _crewArr = crew _vehicle - [driver _vehicle];
 
             if (isNil "_crewArr" || { _crewArr isEqualTo [] }) exitWith {
-                INFO_1("[ARK] %1 - fnc_emptyCargo, All Cargo Dismounted",COMPONENT);
+                INFO("fnc_emptyCargo, All Cargo Dismounted");
                 [_vehicle,_landingPad,_pilot] call ark_rotor_fnc_waitForCargo;
                 _id call CBA_fnc_removePerFrameHandler;
             };

addons/rotor/functions/module_functions.sqf

@@ -7,7 +7,7 @@ ark_rotor_module_preinit = {
         if (_activated) then {
             if (_logic getVariable ["ark_rotor_var_moduleRan", false]) exitWith {
                 if (missionNamespace getVariable ["ark_rotor_var_allowLogging", true]) then {
-                    ERROR_2("[ARK] %1 - module_preInit, Module (%2) tried to execute multiple times.",COMPONENT,_logic);
+                    ERROR_1("module_preInit, Module (%1) tried to execute multiple times.",_logic);
                     missionNamespace setVariable ["ark_rotor_var_allowLogging", false, false];
                 };
             };

addons/rotor/functions/paradrop_functions.sqf

@@ -46,7 +46,7 @@ ark_rotor_fnc_jumpController = {
             private _crewArr = crew _vehicle - [driver _vehicle];
 
             if (isNil "_crewArr" || { _crewArr isEqualTo [] }) exitWith {
-                INFO_1("[ARK] %1 - fnc_jumpController, All Cargo Ejected",COMPONENT);
+                INFO("fnc_jumpController, All Cargo Ejected");
                 _id call CBA_fnc_removePerFrameHandler;
             };