convert log macros to cba versions (#4282)

* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro

addons/advanced_ballistics/XEH_postInit.sqf

@@ -39,7 +39,7 @@ if (!hasInterface) exitWith {};
     {
         _x params ["_modPBO", "_compatPBO"];
         if ((isClass (configFile >> "CfgPatches" >> _modPBO)) && {!isClass (configFile >> "CfgPatches" >> _compatPBO)}) then {
-            ACE_LOGWARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
+            WARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
         };
     } forEach [
         ["RH_acc","ace_compat_rh_acc"],

addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf

@@ -22,7 +22,7 @@ _initStartTime = CBA_missionTime;
 _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
 
 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
-    ACE_LOGINFO_1("Terrain already initialized [world: %1]", worldName);
+    INFO_1("Terrain already initialized [world: %1]", worldName);
     #ifdef DEBUG_MODE_FULL
         systemChat "AdvancedBallistics: Terrain already initialized";
     #endif
@@ -33,14 +33,14 @@ _gridCells = _mapGrids * _mapGrids;
 
 GVAR(currentGrid) = 0;
 
-ACE_LOGINFO_2("Starting Terrain Extension [cells: %1] [world: %2]", _gridCells, worldName);
+INFO_2("Starting Terrain Extension [cells: %1] [world: %2]", _gridCells, worldName);
 
 [{
     params ["_args","_idPFH"];
     _args params ["_mapGrids", "_gridCells", "_initStartTime"];
 
     if (GVAR(currentGrid) >= _gridCells) exitWith {
-        ACE_LOGINFO_2("Finished terrain initialization in %1 seconds [world: %2]", ceil(CBA_missionTime - _initStartTime), worldName);
+        INFO_2("Finished terrain initialization in %1 seconds [world: %2]", ceil(CBA_missionTime - _initStartTime), worldName);
         #ifdef DEBUG_MODE_FULL
             systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(CBA_missionTime - _initStartTime)];
         #endif

addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf

@@ -59,7 +59,7 @@ if ((_typicalSpeed > 0) && {_typicalSpeed < 360}) then {
     if (_inheritedBarrelConfig || _inheritedTempConfig) then {
         private _parentConfig = inheritsFrom _ammoConfig;
         private _parentSpeed = getNumber (_parentConfig >> "typicalSpeed");
-        ACE_LOGWARNING_4("Subsonic Ammo %1 (%2 m/s) missing `ACE_muzzleVelocities` or `ACE_ammoTempMuzzleVelocityShifts` configs, attempting to use parent %3 (%4m/s)",_this,_typicalSpeed,configName _parentConfig, _parentSpeed);
+        WARNING_4("Subsonic Ammo %1 (%2 m/s) missing `ACE_muzzleVelocities` or `ACE_ammoTempMuzzleVelocityShifts` configs, attempting to use parent %3 (%4m/s)",_this,_typicalSpeed,configName _parentConfig, _parentSpeed);
         if (_parentSpeed <= 0) exitWith {//Handle weird or null parent
             _muzzleVelocityTable = [];
             _ammoTempMuzzleVelocityShifts = [];

addons/advanced_ballistics/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ADVANCEDBALLISTICS

addons/advanced_fatigue/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ADVANCED_FATIGUE

addons/advanced_throwing/functions/fnc_moduleInit.sqf

@@ -30,4 +30,4 @@ if (!_activated) exitWith {};
 [_logic, QGVAR(enablePickUp), "enablePickUp"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(enablePickUpAttached), "enablePickUpAttached"] call EFUNC(common,readSettingFromModule);
 
-ACE_LOGINFO_1("Advanced Throwing Module Initialized. Enabled: %1",GVAR(enabled));
+INFO_1("Advanced Throwing Module Initialized. Enabled: %1",GVAR(enabled));

addons/advanced_throwing/script_component.hpp

@@ -6,7 +6,6 @@
 // #define ALLOW_QUICK_THROW
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ADVANCED_THROWING

addons/ai/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_AI

addons/aircraft/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_AIRCRAFT

addons/apl/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_APL

addons/atragmx/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ATRAGMX

addons/attach/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ATTACH

addons/backpacks/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_BACKPACKS

addons/ballistics/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_BALLISTICS

addons/captives/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CAPTIVES

addons/cargo/functions/fnc_makeLoadable.sqf

@@ -28,7 +28,7 @@ private _curSize = [_object] call FUNC(getSizeItem);
 _canLoad = [0, 1] select _canLoad; //convert true/false to scalar
 
 if ((_canLoad == 1) && {_setSize <= 0}) exitWith {
-    ACE_LOGERROR("ace_cargo_fnc_makeLoadable (size <= 0) when making loadable");
+    ERROR("ace_cargo_fnc_makeLoadable (size <= 0) when making loadable");
 };
 
 TRACE_2("setVar if different from config",_canLoad,_cfgCanLoad);

addons/cargo/functions/fnc_moduleMakeLoadable.sqf

@@ -22,7 +22,7 @@ TRACE_3("params",_logic,_objects,_activated);
 
 if ((isNull _logic) || {!_activated}) exitWith {};
 if (_objects isEqualTo []) exitWith {
-    ACE_LOGWARNING_1("ace_cargo_fnc_moduleMakeLoadable has no synced objects [%1]", _logic);
+    WARNING_1("ace_cargo_fnc_moduleMakeLoadable has no synced objects [%1]", _logic);
 };
 
 private _canLoad = _logic getVariable ["canLoad", true];

addons/cargo/functions/fnc_moduleSettings.sqf

@@ -25,4 +25,4 @@ if (!_activated) exitWith {};
 
 [_logic, QGVAR(enable), "enable"] call EFUNC(common,readSettingFromModule);
 
-ACE_LOGINFO("Cargo Module Initialized.");
+INFO("Cargo Module Initialized.");

addons/cargo/functions/fnc_unloadItem.sqf

@@ -37,7 +37,7 @@ if ((count _emptyPosAGL) != 3) exitWith {
 private _loaded = _vehicle getVariable [QGVAR(loaded), []];
 
 if !(_item in _loaded) exitWith {
-    ACE_LOGERROR_3("Tried to unload item [%1] not in vehicle[%2] cargo[%3]", _item, _vehicle, _loaded);
+    ERROR_3("Tried to unload item [%1] not in vehicle[%2] cargo[%3]", _item, _vehicle, _loaded);
     false
 };
 

addons/cargo/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CARGO

addons/chemlights/script_component.hpp

@@ -3,7 +3,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CHEMLIGHTS

addons/common/XEH_postInit.sqf

@@ -65,7 +65,7 @@ if (isServer) then {
         if ((!isNil "_zeusLogic") && {!isNull _zeusLogic}) then {
             {
                 if ((_x getvariable ["bis_fnc_moduleRemoteControl_owner", objnull]) isEqualTo _dcPlayer) exitWith {
-                    ACE_LOGINFO_3("[%1] DC - Was Zeus [%2] while controlling unit [%3] - manually clearing `bis_fnc_moduleRemoteControl_owner`", [_x] call FUNC(getName), _dcPlayer, _x);
+                    INFO_3("[%1] DC - Was Zeus [%2] while controlling unit [%3] - manually clearing `bis_fnc_moduleRemoteControl_owner`", [_x] call FUNC(getName), _dcPlayer, _x);
                     _x setVariable ["bis_fnc_moduleRemoteControl_owner", nil, true];
                 };
                 nil
@@ -91,7 +91,7 @@ if (isServer) then {
 // Event to log Fix Headbug output
 [QGVAR(headbugFixUsed), {
     params ["_profileName", "_animation"];
-    ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
+    INFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
 }] call CBA_fnc_addEventHandler;
 
 [QGVAR(fixCollision), FUNC(fixCollision)] call CBA_fnc_addEventHandler;
@@ -146,7 +146,7 @@ if (isServer) then {
 // Handle JIP scenario
 if (!isServer) then {
     ["ace_playerJIP", {
-        ACE_LOGINFO("JIP event synchronization initialized");
+        INFO("JIP event synchronization initialized");
         ["ACEa", [player]] call CBA_fnc_serverEvent;
     }] call CBA_fnc_addEventHandler;
 } else {
@@ -203,13 +203,13 @@ call FUNC(checkFiles);
     if (isNil QGVAR(settings) || {!isServer && isNil QEGVAR(modules,serverModulesRead)}) exitWith {
         if !(_waitingMsgSent) then {
             _args set [0, true];
-            ACE_LOGINFO("Waiting on settings from server...");
+            INFO("Waiting on settings from server...");
         };
     };
 
     [_this select 1] call CBA_fnc_removePerFrameHandler;
 
-    ACE_LOGINFO("Settings received from server.");
+    INFO("Settings received from server.");
 
     if (isServer) then { //read settings from paramsArray
         [] call FUNC(readSettingsFromParamsArray);
@@ -228,14 +228,14 @@ call FUNC(checkFiles);
         call FUNC(loadSettingsLocalizedText);
     };
 
-    ACE_LOGINFO("Settings initialized.");
+    INFO("Settings initialized.");
 
     //Event that settings are safe to use:
     ["ace_settingsInitialized", []] call CBA_fnc_localEvent;
 
     //Set init finished and run all delayed functions:
     GVAR(settingsInitFinished) = true;
-    ACE_LOGINFO_1("%1 delayed functions running.",count GVAR(runAtSettingsInitialized));
+    INFO_1("%1 delayed functions running.",count GVAR(runAtSettingsInitialized));
 
     {
         (_x select 1) call (_x select 0);

addons/common/functions/fnc__handleRequestSyncedEvent.sqf

@@ -23,7 +23,7 @@ if (isServer) then {
     params ["_eventName", "_client"];
 
     if !([GVAR(syncedEvents), _eventName] call CBA_fnc_hashHasKey) exitWith {
-        ACE_LOGERROR_1("Request for synced event - key [%1] not found.", _eventName);
+        ERROR_1("Request for synced event - key [%1] not found.", _eventName);
         false
     };
 
@@ -42,7 +42,7 @@ if (isServer) then {
         false
     } count _eventLog;
 
-    ACE_LOGINFO_1("[%1] synchronized",_eventName);
+    INFO_1("[%1] synchronized",_eventName);
 };
 
 true

addons/common/functions/fnc__handleSyncedEvent.sqf

@@ -17,7 +17,7 @@
 params ["_name", "_args", "_ttl"];
 
 if !([GVAR(syncedEvents), _name] call CBA_fnc_hashHasKey) exitWith {
-    ACE_LOGERROR_1("Synced event key [%1] not found (_handleSyncedEvent).", _name);
+    ERROR_1("Synced event key [%1] not found (_handleSyncedEvent).", _name);
     false
 };
 

addons/common/functions/fnc_addSyncedEventHandler.sqf

@@ -20,7 +20,7 @@
 params ["_name", "_handler", ["_ttl", 0]];
 
 if ([GVAR(syncedEvents), _name] call CBA_fnc_hashHasKey) exitWith {
-    ACE_LOGERROR_1("Duplicate synced event [%1] creation.",_name);
+    ERROR_1("Duplicate synced event [%1] creation.",_name);
     false
 };
 

addons/common/functions/fnc_addToInventory.sqf

@@ -131,7 +131,7 @@ switch (_type select 0) do {
 
     default {
         _addedToUnit = false;
-        ACE_LOGWARNING_2("Incorrect item type passed to %1, passed: %2",QFUNC(AddToInventory),_type);
+        WARNING_2("Incorrect item type passed to %1, passed: %2",QFUNC(AddToInventory),_type);
     };
 };
 

addons/common/functions/fnc_cachedCall.sqf

@@ -35,7 +35,7 @@ if ((_namespace getVariable [_uid, [-99999]]) select 0 < diag_tickTime) then {
             [_event, {
                 // _eventName is defined on the function that calls the event
                 #ifdef DEBUG_MODE_FULL
-                    ACE_LOGINFO_1("Clear cached variables on event: %1",_eventName);
+                    INFO_1("Clear cached variables on event: %1",_eventName);
                 #endif
                 // Get the list of caches to clear
                 private _varName = format [QGVAR(clearCache_%1), _eventName];
@@ -54,9 +54,9 @@ if ((_namespace getVariable [_uid, [-99999]]) select 0 < diag_tickTime) then {
     };
 
 #ifdef DEBUG_MODE_FULL
-    ACE_LOGINFO_2("Calculated result: %1 %2",_namespace,_uid);
+    INFO_2("Calculated result: %1 %2",_namespace,_uid);
 } else {
-    ACE_LOGINFO_2("Cached result: %1 %2",_namespace,_uid);
+    INFO_2("Cached result: %1 %2",_namespace,_uid);
 #endif
 
 };

addons/common/functions/fnc_checkFiles.sqf

@@ -17,15 +17,15 @@
 ///////////////
 private _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr");
 
-ACE_LOGINFO_1("ACE is version %1.",_version);
+INFO_1("ACE is version %1.",_version);
 
 //CBA Versioning check - close main display if using incompatible version
 private _cbaVersionAr = getArray (configFile >> "CfgPatches" >> "cba_main" >> "versionAr");
 private _cbaRequiredAr = (getArray (configFile >> "CfgSettings" >> "CBA" >> "Versioning" >> "ACE" >> "dependencies" >> "CBA")) select 1;
-ACE_LOGINFO_2("CBA is version %1 [min required %2]",_cbaVersionAr,_cbaRequiredAr);
+INFO_2("CBA is version %1 [min required %2]",_cbaVersionAr,_cbaRequiredAr);
 if ([_cbaRequiredAr, _cbaVersionAr] call cba_versioning_fnc_version_compare) then {
     private _errorMsg = format ["CBA Version [%1] is outdated [required %2]", _cbaVersionAr, _cbaRequiredAr];
-    ACE_LOGERROR(_errorMsg);
+    ERROR(_errorMsg);
     if (hasInterface) then {
         ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
     };
@@ -40,7 +40,7 @@ _addons = _addons select {_x find "ace_" == 0};
     if (getText (configFile >> "CfgPatches" >> _x >> "versionStr") != _version) then {
         private _errorMsg = format ["File %1.pbo is outdated.", _x];
 
-        ACE_LOGERROR(_errorMsg);
+        ERROR(_errorMsg);
 
         if (hasInterface) then {
             ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
@@ -53,7 +53,7 @@ _addons = _addons select {_x find "ace_" == 0};
 // check dlls
 ///////////////
 if (toLower (productVersion select 6) in ["linux", "osx"]) then {
-    ACE_LOGINFO_2("Operating system does not support DLL file format");
+    INFO_2("Operating system does not support DLL file format");
 } else {
     {
         private _versionEx = _x callExtension "version";
@@ -61,14 +61,14 @@ if (toLower (productVersion select 6) in ["linux", "osx"]) then {
         if (_versionEx == "") then {
             private _errorMsg = format ["Extension %1.dll not installed.", _x];
 
-            ACE_LOGERROR(_errorMsg);
+            ERROR(_errorMsg);
 
             if (hasInterface) then {
                 ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
             };
         } else {
             // Print the current extension version
-            ACE_LOGINFO_2("Extension version: %1: %2",_x,_versionEx);
+            INFO_2("Extension version: %1: %2",_x,_versionEx);
         };
         false
     } count getArray (configFile >> "ACE_Extensions" >> "extensions");
@@ -97,7 +97,7 @@ if (isMultiplayer) then {
             if (_version != GVAR(ServerVersion)) then {
                 private _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _version];
 
-                ACE_LOGERROR(_errorMsg);
+                ERROR(_errorMsg);
 
                 if (hasInterface) then {
                     ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
@@ -108,7 +108,7 @@ if (isMultiplayer) then {
             if !(_addons isEqualTo []) then {
                 _errorMsg = format ["Client/Server Addon Mismatch. Client has extra addons: %1.",_addons];
 
-                ACE_LOGERROR(_errorMsg);
+                ERROR(_errorMsg);
 
                 if (hasInterface) then {
                     ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);

addons/common/functions/fnc_checkPBOs.sqf

@@ -63,7 +63,7 @@ if (!isServer) then {
 
             //[QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
 
-            ACE_LOGERROR(_error);
+            ERROR(_error);
 
             if (_mode < 2) then {
                 _text = composeText [lineBreak, parseText format ["<t align='center'>%1</t>", _text]];

addons/common/functions/fnc_claim.sqf

@@ -19,7 +19,7 @@ params ["_unit", "_target", ["_lockTarget", false]];
 private _owner = _target getVariable [QGVAR(owner), objNull];
 
 if (!isNull _owner && {!isNull _unit} && {_unit != _owner}) then {
-    ACE_LOGERROR("Claiming already owned object.");
+    ERROR("Claiming already owned object.");
 };
 
 // transfer this immediately

addons/common/functions/fnc_deprecateComponent.sqf

@@ -40,20 +40,20 @@ if (_isDeprecatedLoaded && {!_isReplacementLoaded}) then {
             private _message = format[
                 "Component %1 is deprecated. It has been replaced by %2. The component %1 is no longer usable on this version. ", _oldComponentName, _newComponentName, _version];
             systemChat format["ACE [ERROR] - %1", _message];
-            ACE_LOGERROR(_message);
+            ERROR(_message);
         };
         case (_componentMajor >= _major && {_componentMinor >= _minor-1}): { // Removed the next this version
             private _message = format[
                 "Component %1 is deprecated. It is replaced by %2. Please disable %1 and make use of %2. "
                 + "The component (%1) will no longer be available from version %3 and later.", _oldComponentName, _newComponentName, _version];
             systemChat format["ACE [WARNING] - %1", _message];
-            ACE_LOGWARNING(_message);
+            WARNING(_message);
         };
         case (_componentMajor == _major && {_componentMinor >= _minor - 2}): { // we are in a version leading up to removal
             private _message = format[
                 "Component %1 is deprecated. It is replaced by %2. Please disable %1 and make use of %2. "
                 + "The component (%1) will no longer be available from version %3 and later.", _oldComponentName, _newComponentName, _version];
-            ACE_LOGWARNING(_message);
+            WARNING(_message);
         };
         default {
         };

addons/common/functions/fnc_disableAI.sqf

@@ -30,7 +30,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then {
     } else {
         //Sanity check to make sure we don't enable unconsious AI
         if (_unit getVariable ["ace_isunconscious", false] && alive _unit) exitWith {
-            ACE_LOGERROR("Enabling AI for unconsious unit");
+            ERROR("Enabling AI for unconsious unit");
         };
 
         _unit enableAI "MOVE";

addons/common/functions/fnc_getMapGridData.sqf

@@ -47,7 +47,7 @@ if (toLower _formatX find "a" != -1) then {_letterGrid = true};
 if (toLower _formatY find "a" != -1) then {_letterGrid = true};
 
 if (_letterGrid) exitWith {
-    ACE_LOGWARNING_3("Map Grid Warning (%1) - Map uses letter grids [%2, %3]",worldName,_formatX,_formatY);
+    WARNING_3("Map Grid Warning (%1) - Map uses letter grids [%2, %3]",worldName,_formatX,_formatY);
 };
 
 //Start at [0, 500] and move north until we get a change in grid
@@ -68,15 +68,15 @@ _stepXat5 = _stepX * 10 ^ ((count _formatX) - 5);
 _stepYat5 = -1 * _stepY * 10 ^ ((count _formatY) - 5);
 
 if (_stepYat5 < 0) then {
-    ACE_LOGWARNING_1("Map Grid Warning (%1) - Northing is reversed.",worldName);
+    WARNING_1("Map Grid Warning (%1) - Northing is reversed.",worldName);
 };
 
 if (_stepXat5 != 1) then {
-    ACE_LOGWARNING_2("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x.",worldName,_stepXat5);
+    WARNING_2("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for x.",worldName,_stepXat5);
 };
 
 if (_stepYat5 != 1 && {_stepYat5 != -1}) then {
-    ACE_LOGWARNING_2("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for y.",worldName,_stepXat5);
+    WARNING_2("Map Grid Warning (%1) - MGRS 10 digit grid does not equal 1 meter: (%2) for y.",worldName,_stepXat5);
 };
 
 GVAR(mapGridData) = [_offsetX, _realOffsetY, _stepXat5, _stepYat5];

addons/common/functions/fnc_getMapPosFromGrid.sqf

@@ -19,7 +19,7 @@
 params ["_inputString", ["_getCenterOfGrid", true]];
 
 if (count GVAR(mapGridData) == 0) exitWith {
-    ACE_LOGERROR("Map has bad data, falling back to BIS_fnc_gridToPos");
+    ERROR("Map has bad data, falling back to BIS_fnc_gridToPos");
     (_this call BIS_fnc_gridToPos) select 0
 };
 

addons/common/functions/fnc_loadSettingsLocalizedText.sqf

@@ -35,11 +35,11 @@ private _fnc_parseConfigForDisplayNames = {
 
     if (!(_values isEqualTo [])) then {
         if (_typeOf != "SCALAR") then {
-            ACE_LOGWARNING_2("Setting [%1] has values[] but is not SCALAR (%2)", _name, _typeOf);
+            WARNING_2("Setting [%1] has values[] but is not SCALAR (%2)", _name, _typeOf);
         } else {
             private _value = missionNamespace getVariable [_name, -1];
             if ((_value < 0) || {_value >= (count _values)}) then {
-                ACE_LOGWARNING_3("Setting [%1] out of bounds %2 (values[] count is %3)", _name, _value, count _values);
+                WARNING_3("Setting [%1] out of bounds %2 (values[] count is %3)", _name, _value, count _values);
             };
         };
     };
@@ -53,7 +53,7 @@ private _fnc_parseConfigForDisplayNames = {
     if !([configFile >> "ACE_Settings" >> _name] call _fnc_parseConfigForDisplayNames) then {
         if !([configFile >> "ACE_ServerSettings" >> _name] call _fnc_parseConfigForDisplayNames) then {
             if !([missionConfigFile >> "ACE_Settings" >> _name] call _fnc_parseConfigForDisplayNames) then {
-                ACE_LOGWARNING_1("Setting found, but couldn't localize [%1] (server has but we don't?)",_name);
+                WARNING_1("Setting found, but couldn't localize [%1] (server has but we don't?)",_name);
             };
         };
     };

addons/common/functions/fnc_moduleCheckPBOs.sqf

@@ -24,4 +24,4 @@ if !(_activated) exitWith {};
 [_logic, QGVAR(checkPBOsCheckAll),   "CheckAll"  ] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(checkPBOsWhitelist),  "Whitelist" ] call EFUNC(common,readSettingFromModule);
 
-ACE_LOGINFO_1("Check-PBOs Module Initialized. Mode: %1.",GVAR(checkPBOsAction));
+INFO_1("Check-PBOs Module Initialized. Mode: %1.",GVAR(checkPBOsAction));

addons/common/functions/fnc_moduleLSDVehicles.sqf

@@ -56,4 +56,4 @@ if (isNil QGVAR(LSD_PFH)) then {
 
     }, 0.02, [0]] call CBA_fnc_addPerFrameHandler;
 };
-ACE_LOGINFO("WEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED.");
+INFO("WEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED.");

addons/common/functions/fnc_playConfigSound3D.sqf

@@ -21,7 +21,7 @@ params ["_soundClass", "_posASL", "_volume", "_distance"];
 private _cfgSound = configFile >> "CfgSounds" >> _soundClass;
 
 if (!isClass _cfgSound) exitWith {
-    ACE_LOGERROR_1("CfgSounds class [%1] does not exist", _soundClass);
+    ERROR_1("CfgSounds class [%1] does not exist", _soundClass);
 };
 
 private _args = getArray (_cfgSound >> "sound");

addons/common/functions/fnc_readSettingFromModule.sqf

@@ -21,7 +21,7 @@ params ["_logic", "_settingName", "_moduleVariable"];
 
 // Check if the parameter is defined in the module
 if (isNil {_logic getVariable _moduleVariable}) exitWith {
-    ACE_LOGWARNING_2("Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.",typeOf _logic,_moduleVariable);
+    WARNING_2("Warning in %1 module: %2 setting is missing. Probably an obsolete version of the module is used in the mission.",typeOf _logic,_moduleVariable);
 };
 
 private _value = _logic getVariable _moduleVariable;
@@ -29,7 +29,7 @@ if (_value isEqualTo -1) then {
     //3den missions will save modules with value = 0 as -1
     //If the setting has a "values" array, we should be able to assume that -1 is not a valid number as it would not be a valid index for the array
     if (isArray (configFile >> "ACE_Settings" >> _settingName >> "values")) then {
-        ACE_LOGWARNING_2("Module For Setting [%1] is saved as (-1), switching to (0) - missionVersion [%2]",_settingName,missionVersion);
+        WARNING_2("Module For Setting [%1] is saved as (-1), switching to (0) - missionVersion [%2]",_settingName,missionVersion);
         _value = 0;
     };
 };

addons/common/functions/fnc_readSettingsFromParamsArray.sqf

@@ -32,14 +32,14 @@ TRACE_1("Reading missionConfigFile params",_paramsArray);
 
         // Check if the variable is already defined
         if (isNil _settingName) exitWith {
-            ACE_LOGERROR_1("readSettingsFromParamsArray - param [%1] is not an ace_setting", _settingName);
+            ERROR_1("readSettingsFromParamsArray - param [%1] is not an ace_setting", _settingName);
         };
 
         private _settingData = [_settingName] call FUNC(getSettingData);
         _settingData params ["", "_typeName", "", "", "", "", "_isForced"];
 
         // Check if it's already forced and quit
-        if (_isForced) exitWith {ACE_LOGWARNING_1("readSettingsFromParamsArray - param [%1] is already set and forced", _settingName);};
+        if (_isForced) exitWith {WARNING_1("readSettingsFromParamsArray - param [%1] is already set and forced", _settingName);};
 
         // The setting is not forced, so update the value
         // Read entry and cast it to the correct type from the existing variable
@@ -54,7 +54,7 @@ TRACE_1("Reading missionConfigFile params",_paramsArray);
         };
 
         if (!_validValue) exitWith {
-            ACE_LOGWARNING_3("readSettingsFromParamsArray - param [%1] type not valid [%2] - expected type [%3]", _settingName,_settingValue,_typeName);
+            WARNING_3("readSettingsFromParamsArray - param [%1] type not valid [%2] - expected type [%3]", _settingName,_settingValue,_typeName);
         };
 
         // Update the variable globaly and Force

addons/common/functions/fnc_removeSyncedEventHandler.sqf

@@ -15,7 +15,7 @@
 params ["_name"];
 
 if !([GVAR(syncedEvents), _name] call CBA_fnc_hashHasKey) exitWith {
-    ACE_LOGERROR_1("Synced event key [%1] not found (removeSyncedEventHandler).", _name);
+    ERROR_1("Synced event key [%1] not found (removeSyncedEventHandler).", _name);
     false
 };
 

addons/common/functions/fnc_setSetting.sqf

@@ -26,19 +26,19 @@ private _settingData = [_name] call FUNC(getSettingData);
 
 // Exit if the setting does not exist
 if (_settingData isEqualTo []) exitWith {
-    ACE_LOGERROR_1("SetSetting [%1] setting does not exist", _name);
+    ERROR_1("SetSetting [%1] setting does not exist", _name);
 };
 
 _settingData params ["", "_typeName", "_isClientSetable", "", "", "", "_isForced"];
 
 // Exit if the setting is already forced
 if (_isForced) exitWith {
-    ACE_LOGINFO_1("SetSetting [%1] Trying to set forced setting", _name);
+    INFO_1("SetSetting [%1] Trying to set forced setting", _name);
 };
 
 //This does NOT broadcast changes to GVAR(settings), so clients would not get updated force status
 if ((missionNamespace getVariable [QEGVAR(modules,serverModulesRead), false]) && {!(_isForced isEqualTo _force)}) then {
-    ACE_LOGWARNING_3("SetSetting [%1] attempting to broadcast a change to force (%2 to %3)", _name, _isForced, _force);
+    WARNING_3("SetSetting [%1] attempting to broadcast a change to force (%2 to %3)", _name, _isForced, _force);
 };
 
 // If the type is not equal, try to cast it
@@ -61,7 +61,7 @@ if (typeName _value != _settingData select 1) then {
     };
 };
 
-if (_failed) exitWith {ACE_LOGERROR_3("SetSetting [%1] bad data type expected %2 got %3", _name, _typeName, typeName _value);};
+if (_failed) exitWith {ERROR_3("SetSetting [%1] bad data type expected %2 got %3", _name, _typeName, typeName _value);};
 
 // Force it if it was required
 _settingData set [6, _force];

addons/common/functions/fnc_showHud.sqf

@@ -33,7 +33,7 @@ params [["_reason", "", [""]], ["_mask", [], [[]], [0,8]]];
 
 if (isArray (missionConfigFile >> "showHUD")) then {
     //(showHud = 0;) is fine - the array is the problem
-    ACE_LOGWARNING("showHUD[] in Description.ext breaks the showHud command");
+    WARNING("showHUD[] in Description.ext breaks the showHud command");
 };
 
 if (_reason != "") then {

addons/common/functions/fnc_statusEffect_addType.sqf

@@ -21,8 +21,8 @@
 params [["_name", "", [""]], ["_isGlobal", false, [false]], ["_commonReasonsArray", [], [[]]]];
 TRACE_3("params",_name,_isGlobal,_commonReasonsArray);
 
-if (_name == "") exitWith {ACE_LOGERROR_1("addStatusEffect - Bad Name %1", _this)};
+if (_name == "") exitWith {ERROR_1("addStatusEffect - Bad Name %1", _this)};
-if (_name in GVAR(statusEffect_Names)) exitWith {ACE_LOGWARNING_1("addStatusEffect - Effect Already Added (note, will not update global bit) %1", _this)};
+if (_name in GVAR(statusEffect_Names)) exitWith {WARNING_1("addStatusEffect - Effect Already Added (note, will not update global bit) %1", _this)};
 
 GVAR(statusEffect_Names) pushBack _name;
 GVAR(statusEffect_isGlobal) pushBack _isGlobal;

addons/common/functions/fnc_syncedEvent.sqf

@@ -17,7 +17,7 @@
 params ["_name", "_args", ["_ttl", 0]];
 
 if !([GVAR(syncedEvents), _name] call CBA_fnc_hashHasKey) exitWith {
-    ACE_LOGERROR_1("Synced event key [%1] not found (syncedEvent).", _name);
+    ERROR_1("Synced event key [%1] not found (syncedEvent).", _name);
     false
 };
 

addons/common/functions/fnc_unloadPersonLocal.sqf

@@ -24,7 +24,7 @@ private _emptyPos = [_vehicle, (typeOf _unit), _unloader] call EFUNC(common,find
 TRACE_1("findUnloadPosition",_emptyPos);
 
 if (count _emptyPos != 3) exitwith {
-    ACE_LOGWARNING_4("Could not find unload pos %1-ASL: %2 isTouchingGround: %3 Speed: %4",_vehicle, getPosASL _vehicle, isTouchingGround _vehicle, speed _vehicle);
+    WARNING_4("Could not find unload pos %1-ASL: %2 isTouchingGround: %3 Speed: %4",_vehicle, getPosASL _vehicle, isTouchingGround _vehicle, speed _vehicle);
     if ((!isNull _unloader) && {[_unloader] call FUNC(isPlayer)}) then {
         //display text saying there are no safe places to exit the vehicle
         [QGVAR(displayTextStructured), [localize LSTRING(NoRoomToUnload)], [_unloader]] call CBA_fnc_targetEvent;

addons/common/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_COMMON

addons/concertina_wire/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CONCERTINA_WIRE

addons/cookoff/functions/fnc_cookOff.sqf

@@ -31,7 +31,7 @@ if (local _vehicle) then {
     private _positions = getArray (_config >> QGVAR(cookoffSelections)) select {!((_vehicle selectionPosition _x) isEqualTo [0,0,0])};
 
     if (_positions isEqualTo []) then {
-        ACE_LOGWARNING_1("no valid selection for cookoff found. %1", typeOf _vehicle);
+        WARNING_1("no valid selection for cookoff found. %1", typeOf _vehicle);
         _positions pushBack "#noselection";
     };
 

addons/cookoff/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_COOKOFF

addons/dagr/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_DAGR

addons/disarming/functions/fnc_eventCallerFinish.sqf

@@ -23,4 +23,4 @@ params ["_caller", "_target", "_errorMsg"];
 if (_caller != ACE_player) exitWith {};
 
 systemChat format ["Debug-Caller: Disarm finished from [%1] with code [%2]", _target, _errorMsg];
-ACE_LOGINFO_2("%1 - eventCallerFinish: %2",CBA_missionTime,_this);
+INFO_2("%1 - eventCallerFinish: %2",CBA_missionTime,_this);

addons/disarming/functions/fnc_eventTargetFinish.sqf

@@ -22,6 +22,6 @@
 params ["_caller", "_target", "_errorMsg"];
 
 if (_errorMsg != "") then {
-    ACE_LOGINFO_2("%1 - eventTargetFinish: %2",CBA_missionTime,_this);
+    INFO_2("%1 - eventTargetFinish: %2",CBA_missionTime,_this);
     [QGVAR(debugCallback), [_caller, _target, _errorMsg], [_caller]] call CBA_fnc_targetEvent;
 };

addons/disarming/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_DISARMING

addons/disposable/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ATTACH

addons/dogtags/functions/fnc_getDogtagItem.sqf

@@ -26,7 +26,7 @@ private _allDogtagDatas = missionNamespace getVariable [QGVAR(allDogtagDatas), [
 
 private _nextID = count _allDogtags + 1;
 
-if (_nextID > 999) exitWith {ACE_LOGERROR("Ran out of IDs");};
+if (_nextID > 999) exitWith {ERROR("Ran out of IDs");};
 
 private _dogTagData = [_target] call FUNC(getDogTagData);
 private _item = format ["ACE_dogtag_%1", _nextID];

addons/dogtags/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_DOGTAGS

addons/dragging/script_component.hpp

@@ -5,7 +5,6 @@
 //#define DEBUG_ENABLED_DRAGGING
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_DRAGGING

addons/explosives/functions/fnc_module.sqf

@@ -23,4 +23,4 @@ params ["_logic"];
 [_logic, QGVAR(PunishNonSpecialists),"PunishNonSpecialists"] call EFUNC(Common,readSettingFromModule);
 [_logic, QGVAR(ExplodeOnDefuse),"ExplodeOnDefuse"] call EFUNC(Common,readSettingFromModule);
 
-ACE_LOGINFO("Explosive Module Initialized.");
+INFO("Explosive Module Initialized.");

addons/explosives/functions/fnc_placeExplosive.sqf

@@ -36,7 +36,7 @@ if (!isNull _setupPlaceholderObject) then {
 };
 
 if (isNil "_triggerConfig") exitWith {
-    ACE_LOGERROR_1("Config not passed to PlaceExplosive: %1",_this);
+    ERROR_1("Config not passed to PlaceExplosive: %1",_this);
     objNull
 };
 
@@ -44,7 +44,7 @@ _magazineTrigger = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Trigge
 _triggerConfig = ConfigFile >> "ACE_Triggers" >> _triggerConfig;
 
 if (isNil "_triggerConfig") exitWith {
-    ACE_LOGERROR_1("Config not found in PlaceExplosive: %1",_this);
+    ERROR_1("Config not found in PlaceExplosive: %1",_this);
     objNull
 };
 

addons/explosives/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_EXPLOSIVES

addons/fastroping/functions/fnc_deployAI.sqf

@@ -25,7 +25,7 @@ if (isNull _vehicle || {!(_vehicle isKindOf "Helicopter")}) exitWith {
         // Note: BIS_fnc_guiMessage causes a CTD with call, so spawn is used instead.
         ["deployAI was called with an invalid or non-existant vehicle.", QFUNC(deployAI)] spawn BIS_fnc_guiMessage;
     };
-    ACE_LOGERROR('FUNC(deployAI): deployAI was called with an invalid or non-existant vehicle.');
+    ERROR('FUNC(deployAI): deployAI was called with an invalid or non-existant vehicle.');
 };
 
 _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
@@ -34,14 +34,14 @@ if (_configEnabled == 0) exitWith {
     if (hasInterface) then {
         [format ["You cannot fast rope from a ""%1"" helicopter.", getText (_config >> "DisplayName")], QFUNC(deployAI)] spawn BIS_fnc_guiMessage;
     };
-    ACE_LOGERROR_1('FUNC(deployAI): You cannot fast rope from a "%1" helicopter.',getText (_config >> "DisplayName"));
+    ERROR_1('FUNC(deployAI): You cannot fast rope from a "%1" helicopter.',getText (_config >> "DisplayName"));
 };
 
 if (_configEnabled == 2 && {isNull (_vehicle getVariable [QGVAR(FRIES), objNull])}) exitWith {
     if (hasInterface) then {
         [format ["""%1"" requires a FRIES for fastroping, but has not been equipped with one.", getText (_config >> "DisplayName")], QFUNC(deployAI)] spawn BIS_fnc_guiMessage;
     };
-    ACE_LOGERROR_1('FUNC(deployAI): "%1" requires a FRIES for fastroping but has not been equipped with one.',getText (_config >> "DisplayName"));
+    ERROR_1('FUNC(deployAI): "%1" requires a FRIES for fastroping but has not been equipped with one.',getText (_config >> "DisplayName"));
 };
 
 _unitsToDeploy = crew _vehicle;
@@ -52,7 +52,7 @@ if (_deploySpecial) then {
 };
 
 if (_unitsToDeploy isEqualTo []) exitWith {
-    ACE_LOGWARNING_1('FUNC(deployAI): Found no units to deploy in "%1".',getText (_config >> "DisplayName"));
+    WARNING_1('FUNC(deployAI): Found no units to deploy in "%1".',getText (_config >> "DisplayName"));
 };
 
 if (_createDeploymentGroup) then {

addons/fastroping/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FASTROPING

addons/fcs/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FCS

addons/finger/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FINGER

addons/flashlights/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FLASHLIGHTS

addons/flashsuppressors/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FLASHSUPPRESSORS

addons/fonts/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FONTS

addons/frag/functions/fnc_doSpall.sqf

@@ -81,7 +81,7 @@ if(_alive || {_caliber >= 2.5} || {(_explosive > 0 && {_idh >= 1})}) then {
                 if(_gC == 0) then { _gC = 2440; _warn = true;};
 
                 if(_warn) then {
-                    ACE_LOGWARNING_1("Ammo class %1 lacks proper explosive properties definitions for frag!",_roundType); //TODO: turn this off when we get closer to release
+                    WARNING_1("Ammo class %1 lacks proper explosive properties definitions for frag!",_roundType); //TODO: turn this off when we get closer to release
                 };
 
                 private _fragPower = (((_m/_c)+_k)^-(1/2))*_gC;

addons/frag/functions/fnc_frago.sqf

@@ -65,7 +65,7 @@ _gC = getNumber(configFile >> "CfgAmmo" >> _shellType >> QGVAR(GURNEY_C));
 if(_gC == 0) then { _gC = 2440; _warn = true;};
 
 if(_warn) then {
-    ACE_LOGWARNING_1("Ammo class %1 lacks proper explosive properties definitions for frag!",_shellType); //TODO: turn this off when we get closer to release
+    WARNING_1("Ammo class %1 lacks proper explosive properties definitions for frag!",_shellType); //TODO: turn this off when we get closer to release
 };
 
 _fragPower = (((_m/_c)+_k)^-(1/2))*_gC;

addons/frag/script_component.hpp

@@ -5,7 +5,6 @@
 //#define DEBUG_ENABLED_FRAG
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FRAG

addons/gestures/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_GESTURES

addons/gforces/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_GFORCES

addons/goggles/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_GOGGLES

addons/grenades/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_GRENADES

addons/gunbag/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_ENABLED_GUNBAG
 // #define DISABLE_COMPILE_CACHE
-//#define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_GUNBAG

addons/hearing/functions/fnc_moduleHearing.sqf

@@ -20,4 +20,4 @@ if ((_logic getVariable "DisableEarRinging") != -1) then {
 };
 [_logic, QGVAR(enabledForZeusUnits), "enabledForZeusUnits"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(autoAddEarplugsToUnits), "autoAddEarplugsToUnits"] call EFUNC(common,readSettingFromModule);
-ACE_LOGINFO("Hearing Module Initialized.");
+INFO("Hearing Module Initialized.");

addons/hearing/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_HEARING

addons/hitreactions/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_HITREACTIONS

addons/huntir/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_HUNTIR

addons/interact_menu/functions/fnc_addActionToClass.sqf

@@ -64,8 +64,7 @@ if (_parentPath isEqualTo ["ACE_MainActions"]) then {
 
 private _parentNode = [_actionTrees, _parentPath] call FUNC(findActionNode);
 if (isNil {_parentNode}) exitWith {
-    ERROR("Failed to add action");
+    ERROR_4("Failed to add action - action (%1) to parent %2 on object %3 [%4]",(_action select 0),_parentPath,_objectType,_typeNum);
-    ACE_LOGERROR_4("action (%1) to parent %2 on object %3 [%4]",(_action select 0),_parentPath,_objectType,_typeNum);
     []
 };
 

addons/interact_menu/functions/fnc_compileMenu.sqf

@@ -33,7 +33,7 @@ private _recurseFnc = {
             private _displayName = getText (_entryCfg >> "displayName");
             private _distance = _parentDistance;
             if (isNumber (_entryCfg >> "distance")) then {_distance = getNumber (_entryCfg >> "distance");};
-            // if (_distance < _parentDistance) then {ACE_LOGWARNING_3("[%1] distance %2 less than parent %3", configName _entryCfg, _distance, _parentDistance);};
+            // if (_distance < _parentDistance) then {WARNING_3("[%1] distance %2 less than parent %3", configName _entryCfg, _distance, _parentDistance);};
             private _icon = getText (_entryCfg >> "icon");
             private _statement = compile (getText (_entryCfg >> "statement"));
 

addons/interact_menu/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_INTERACT_MENU

addons/interaction/functions/fnc_moduleInteraction.sqf

@@ -23,4 +23,4 @@ if !(_activated) exitWith {};
 
 [_logic, QGVAR(EnableTeamManagement), "EnableTeamManagement"] call EFUNC(common,readSettingFromModule);
 
-ACE_LOGINFO("Interaction Module Initialized.");
+INFO("Interaction Module Initialized.");

addons/interaction/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_INTERACTION

addons/inventory/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_INVENTORY

addons/javelin/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_JAVELIN

addons/kestrel4500/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_KESTREL4500

addons/laser/functions/fnc_drawVisibleLaserTargets.sqf

@@ -1,9 +1,9 @@
 // This is a debug function for displaying visible lasers for ourselves
 #include "script_component.hpp"
 
-ACE_LOGINFO("Laser Emitter Dump");
+INFO("Laser Emitter Dump");
 
 {
-    ACE_LOGINFO_1("  %1", _x);
+    INFO_1("  %1", _x);
-    ACE_LOGINFO_1("    %1",[ARR_2(GVAR(laserEmitters),_x)] call CBA_fnc_hashGet);
+    INFO_1("    %1",[ARR_2(GVAR(laserEmitters),_x)] call CBA_fnc_hashGet);
 } forEach (GVAR(laserEmitters) select 1);

addons/laser/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_LASER

addons/laser_selfdesignate/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_LASER_SELFDESIGNATE

addons/laserpointer/functions/fnc_switchLaserLightMode.sqf

@@ -48,7 +48,7 @@ if (!_error) then {
 
     [_description, _picture] call EFUNC(common,displayTextPicture);
 } else {
-    ACE_LOGERROR_3("Failed to add %1 to %2 - reverting to %3",_nextPointer,_weapon,_pointer);
+    ERROR_3("Failed to add %1 to %2 - reverting to %3",_nextPointer,_weapon,_pointer);
 };
 
 playSound "ACE_Sound_Click";

addons/laserpointer/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_LASERPOINTER

addons/logistics_uavbattery/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_LOGISTICS_UAVBATTERY

addons/logistics_wirecutter/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_LOGISTICS_WIRECUTTER

addons/magazinerepack/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_MAGAZINEREPACK

addons/main/script_component.hpp

@@ -4,7 +4,6 @@
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_MAIN

addons/main/script_macros.hpp

@@ -1,11 +1,4 @@
-// BWC for CBA's DEBUG_SYNCHRONOUS - https://github.com/CBATeam/CBA_A3/pull/466/
-#ifdef CBA_DEBUG_SYNCHRONOUS
-    // For New CBA:
 #define DEBUG_SYNCHRONOUS
-    // For Old CBA:
-    #define CBA_fnc_log { params ["_file","_lineNum","_message"]; diag_log [diag_frameNo, diag_tickTime, time,  _file + ":"+str(_lineNum + 1), _message]; }
-#endif
-
 #include "\x\cba\addons\main\script_macros_common.hpp"
 #include "\x\cba\addons\xeh\script_xeh.hpp"
 
@@ -105,93 +98,7 @@
 
 #define IDC_STAMINA_BAR 193
 
-#define ACE_LOG(module,level,message) diag_log text ACE_LOGFORMAT(module,level,message)
+#define ACE_DEPRECATED(arg1,arg2,arg3) WARNING_3("%1 is deprecated. Support will be dropped in version %2. Replaced by: %3",arg1,arg2,arg3)
-#define ACE_LOGFORMAT(module,level,message) FORMAT_2(QUOTE([ACE] (module) %1: %2),level,message)
-
-#define ACE_LOG_FILELINENUMBERS(module,level,message) diag_log text ACE_LOGFORMAT_FILELINENUMBERS(module,level,message)
-#define ACE_LOGFORMAT_FILELINENUMBERS(module,level,message) FORMAT_4(QUOTE([ACE] (module) %1: %2 File: %3 Line: %4),level,message,__FILE__,__LINE__)
-
-#define ACE_LOGERROR(message) ACE_LOG_FILELINENUMBERS(COMPONENT,"ERROR",message)
-#define ACE_LOGERROR_1(message,arg1) ACE_LOGERROR(FORMAT_1(message,arg1))
-#define ACE_LOGERROR_2(message,arg1,arg2) ACE_LOGERROR(FORMAT_2(message,arg1,arg2))
-#define ACE_LOGERROR_3(message,arg1,arg2,arg3) ACE_LOGERROR(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_LOGERROR_4(message,arg1,arg2,arg3,arg4) ACE_LOGERROR(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_LOGERROR_5(message,arg1,arg2,arg3,arg4,arg5) ACE_LOGERROR(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_LOGERROR_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_LOGERROR(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_LOGERROR_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_LOGERROR(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_LOGERROR_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_LOGERROR(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_ERRORFORMAT(message) ACE_LOGFORMAT_FILELINENUMBERS(COMPONENT,"ERROR",message)
-#define ACE_ERRORFORMAT_1(message,arg1) ACE_ERRORFORMAT(FORMAT_1(message,arg1))
-#define ACE_ERRORFORMAT_2(message,arg1,arg2) ACE_ERRORFORMAT(FORMAT_2(message,arg1,arg2))
-#define ACE_ERRORFORMAT_3(message,arg1,arg2,arg3) ACE_ERRORFORMAT(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_ERRORFORMAT_4(message,arg1,arg2,arg3,arg4) ACE_ERRORFORMAT(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_ERRORFORMAT_5(message,arg1,arg2,arg3,arg4,arg5) ACE_ERRORFORMAT(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_ERRORFORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_ERRORFORMAT(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_ERRORFORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_ERRORFORMAT(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_ERRORFORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_ERRORFORMAT(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_LOGWARNING(message) ACE_LOG_FILELINENUMBERS(COMPONENT,"WARNING",message)
-#define ACE_LOGWARNING_1(message,arg1) ACE_LOGWARNING(FORMAT_1(message,arg1))
-#define ACE_LOGWARNING_2(message,arg1,arg2) ACE_LOGWARNING(FORMAT_2(message,arg1,arg2))
-#define ACE_LOGWARNING_3(message,arg1,arg2,arg3) ACE_LOGWARNING(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_LOGWARNING_4(message,arg1,arg2,arg3,arg4) ACE_LOGWARNING(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_LOGWARNING_5(message,arg1,arg2,arg3,arg4,arg5) ACE_LOGWARNING(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_LOGWARNING_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_LOGWARNING(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_LOGWARNING_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_LOGWARNING(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_LOGWARNING_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_LOGWARNING(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_WARNINGFORMAT(message) ACE_LOGFORMAT_FILELINENUMBERS(COMPONENT,"WARNING",message)
-#define ACE_WARNINGFORMAT_1(message,arg1) ACE_WARNINGFORMAT(FORMAT_1(message,arg1))
-#define ACE_WARNINGFORMAT_2(message,arg1,arg2) ACE_WARNINGFORMAT(FORMAT_2(message,arg1,arg2))
-#define ACE_WARNINGFORMAT_3(message,arg1,arg2,arg3) ACE_WARNINGFORMAT(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_WARNINGFORMAT_4(message,arg1,arg2,arg3,arg4) ACE_WARNINGFORMAT(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_WARNINGFORMAT_5(message,arg1,arg2,arg3,arg4,arg5) ACE_WARNINGFORMAT(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_WARNINGFORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_WARNINGFORMAT(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_WARNINGFORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_WARNINGFORMAT(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_WARNINGFORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_WARNINGFORMAT(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_LOGINFO(message) ACE_LOG(COMPONENT,"INFO",message)
-#define ACE_LOGINFO_1(message,arg1) ACE_LOGINFO(FORMAT_1(message,arg1))
-#define ACE_LOGINFO_2(message,arg1,arg2) ACE_LOGINFO(FORMAT_2(message,arg1,arg2))
-#define ACE_LOGINFO_3(message,arg1,arg2,arg3) ACE_LOGINFO(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_LOGINFO_4(message,arg1,arg2,arg3,arg4) ACE_LOGINFO(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_LOGINFO_5(message,arg1,arg2,arg3,arg4,arg5) ACE_LOGINFO(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_LOGINFO_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_LOGINFO(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_LOGINFO_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_LOGINFO(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_LOGINFO_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_LOGINFO(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_INFOFORMAT(message) ACE_LOGFORMAT(COMPONENT,"INFO",message)
-#define ACE_INFOFORMAT_1(message,arg1) ACE_INFOFORMAT(FORMAT_1(message,arg1))
-#define ACE_INFOFORMAT_2(message,arg1,arg2) ACE_INFOFORMAT(FORMAT_2(message,arg1,arg2))
-#define ACE_INFOFORMAT_3(message,arg1,arg2,arg3) ACE_INFOFORMAT(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_INFOFORMAT_4(message,arg1,arg2,arg3,arg4) ACE_INFOFORMAT(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_INFOFORMAT_5(message,arg1,arg2,arg3,arg4,arg5) ACE_INFOFORMAT(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_INFOFORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_INFOFORMAT(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_INFOFORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_INFOFORMAT(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_INFOFORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_INFOFORMAT(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_LOGDEBUG(message) ACE_LOG_FILELINENUMBERS(COMPONENT,"DEBUG",message)
-#define ACE_LOGDEBUG_1(message,arg1) ACE_LOGDEBUG(FORMAT_1(message,arg1))
-#define ACE_LOGDEBUG_2(message,arg1,arg2) ACE_LOGDEBUG(FORMAT_2(message,arg1,arg2))
-#define ACE_LOGDEBUG_3(message,arg1,arg2,arg3) ACE_LOGDEBUG(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_LOGDEBUG_4(message,arg1,arg2,arg3,arg4) ACE_LOGDEBUG(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_LOGDEBUG_5(message,arg1,arg2,arg3,arg4,arg5) ACE_LOGDEBUG(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_LOGDEBUG_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_LOGDEBUG(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_LOGDEBUG_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_LOGDEBUG(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_LOGDEBUG_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_LOGDEBUG(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_DEBUGFORMAT(message) ACE_LOGFORMAT_FILELINENUMBERS(COMPONENT,"DEBUG",message)
-#define ACE_DEBUGFORMAT_1(message,arg1) ACE_DEBUGFORMAT(FORMAT_1(message,arg1))
-#define ACE_DEBUGFORMAT_2(message,arg1,arg2) ACE_DEBUGFORMAT(FORMAT_2(message,arg1,arg2))
-#define ACE_DEBUGFORMAT_3(message,arg1,arg2,arg3) ACE_DEBUGFORMAT(FORMAT_3(message,arg1,arg2,arg3))
-#define ACE_DEBUGFORMAT_4(message,arg1,arg2,arg3,arg4) ACE_DEBUGFORMAT(FORMAT_4(message,arg1,arg2,arg3,arg4))
-#define ACE_DEBUGFORMAT_5(message,arg1,arg2,arg3,arg4,arg5) ACE_DEBUGFORMAT(FORMAT_5(message,arg1,arg2,arg3,arg4,arg5))
-#define ACE_DEBUGFORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6) ACE_DEBUGFORMAT(FORMAT_6(message,arg1,arg2,arg3,arg4,arg5,arg6))
-#define ACE_DEBUGFORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ACE_DEBUGFORMAT(FORMAT_7(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7))
-#define ACE_DEBUGFORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) ACE_DEBUGFORMAT(FORMAT_8(message,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8))
-
-#define ACE_DEPRECATED(arg1,arg2,arg3) ACE_LOGWARNING_3("%1 is deprecated. Support will be dropped in version %2. Replaced by: %3",arg1,arg2,arg3)
 
 #define PFORMAT_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) \
     format ['%1: A=%2, B=%3, C=%4, D=%5, E=%6, F=%7, G=%8, H=%9, I=%10 J=%11', MESSAGE, RETNIL(A), RETNIL(B), RETNIL(C), RETNIL(D), RETNIL(E), RETNIL(F), RETNIL(G), RETNIL(H), RETNIL(I), RETNIL(J)]

addons/map/XEH_postInitClient.sqf

@@ -63,9 +63,9 @@ call FUNC(determineZoom);
 
             setCurrentChannel GVAR(DefaultChannel);
             if (currentChannel == GVAR(DefaultChannel)) then {
-                // ACE_LOGINFO_1("Channel Set - %1", currentChannel);
+                // INFO_1("Channel Set - %1", currentChannel);
             } else {
-                ACE_LOGERROR_2("Failed To Set Channel %1 (is %2)", GVAR(DefaultChannel), currentChannel);
+                ERROR_2("Failed To Set Channel %1 (is %2)", GVAR(DefaultChannel), currentChannel);
             };
         }, 0, []] call CBA_fnc_addPerFrameHandler;
     };

addons/map/functions/fnc_blueForceTrackingModule.sqf

@@ -20,4 +20,4 @@ params ["_logic"];
 [_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(BFT_ShowPlayerNames), "ShowPlayerNames"] call EFUNC(common,readSettingFromModule);
 
-ACE_LOGINFO_3("Blue Force Tracking Module Initialized:", GVAR(BFT_Enabled), GVAR(BFT_Interval), GVAR(BFT_HideAiGroups));
+INFO_3("Blue Force Tracking Module Initialized:", GVAR(BFT_Enabled), GVAR(BFT_Interval), GVAR(BFT_HideAiGroups));