Merge pull request #32 from acemod/updateLogMacros

Update to new CBA logging macros

Author: PabstMirror

addons/headless/functions/fnc_handleConnectHC.sqf

@@ -29,7 +29,7 @@ if (!GVAR(Enabled) || {_headlessClient in GVAR(headlessClients)}) exitWith {};
 GVAR(headlessClients) pushBack _headlessClient;
 
 if (GVAR(Log)) then {
-    ACE_LOGINFO_1("Registered HC: %1",_headlessClient);
+    INFO_1("Registered HC: %1",_headlessClient);
 };
 
 // Rebalance

addons/headless/functions/fnc_handleDisconnect.sqf

@@ -49,7 +49,7 @@ if !(_object in GVAR(headlessClients)) exitWith {
 GVAR(headlessClients) deleteAt (GVAR(headlessClients) find _object);
 
 if (GVAR(Log)) then {
-    ACE_LOGINFO_1("Removed HC: %1",_object);
+    INFO_1("Removed HC: %1",_object);
 };
 
 // Rebalance

addons/headless/functions/fnc_moduleInit.sqf

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

addons/headless/functions/fnc_transferGroups.sqf

@@ -24,7 +24,7 @@ GVAR(headlessClients) params [
 ];
 
 if (GVAR(Log)) then {
-    ACE_LOGINFO_2("Present HCs: %1 - Full Rebalance: %2", GVAR(headlessClients), _force);
+    INFO_2("Present HCs: %1 - Full Rebalance: %2", GVAR(headlessClients), _force);
 };
 
 // Enable round-robin load balancing if more than one HC is present
@@ -130,7 +130,7 @@ private _numTransferredHC3 = 0;
 
 if (GVAR(Log)) then {
     private _numTransferredTotal = _numTransferredHC1 + _numTransferredHC2 + _numTransferredHC3;
-    ACE_LOGINFO_4("Groups Transferred: Total: %1 - HC1: %2 - HC2: %3 - HC3: %4", _numTransferredTotal, _numTransferredHC1, _numTransferredHC2, _numTransferredHC3);
+    INFO_4("Groups Transferred: Total: %1 - HC1: %2 - HC2: %3 - HC3: %4", _numTransferredTotal, _numTransferredHC1, _numTransferredHC2, _numTransferredHC3);
 };
 
 // Allow rebalance flag

addons/main/script_macros.hpp

@@ -1,8 +1,5 @@
 #include "\z\ace\addons\main\script_macros.hpp"
 
-#undef ACE_LOGFORMAT
-#define ACE_LOGFORMAT(module,level,message) FORMAT_2(QUOTE([ACEX] (module) %1: %2),level,message)
-
 #define ACE_PREFIX ace
 
 #define ACEGVAR(module,var) TRIPLES(ACE_PREFIX,module,var)

addons/sitting/functions/fnc_moduleInit.sqf

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

addons/viewrestriction/XEH_clientInit.sqf

@@ -15,12 +15,12 @@ if !(hasInterface) exitWith {};
         {GVAR(modeSelectiveSea) == 0}/* &&
         {GVAR(modeSelectiveUAV) == 0}*/
     ) exitWith {
-        ACE_LOGWARNING("Selective mode enabled, but all sub-modes are disabled.")
+        WARNING("Selective mode enabled, but all sub-modes are disabled.")
     };
 
     // Exit if third person view is not available
     if (difficultyOption "thirdPersonView" == 0) exitWith {
-        ACE_LOGWARNING("View Restriction is enabled, but 3rd person is disabled with server difficulty.");
+        WARNING("View Restriction is enabled, but 3rd person is disabled with server difficulty.");
     };
 
     // Add Event Handler for changing camera - also happens on spawn

addons/viewrestriction/functions/fnc_moduleInit.sqf

@@ -28,7 +28,7 @@ if (GVAR(mode) == 3) then {
     [_logic, QGVAR(modeSelectiveSea), "modeSelectiveSea"] call ACEFUNC(common,readSettingFromModule);
     //[_logic, QGVAR(modeSelectiveUAV), "modeSelectiveUAV"] call ACEFUNC(common,readSettingFromModule); // Disabled - Reference comment in FUNC(canChangeCamera)
 
-    ACE_LOGINFO_5("View Restriction Module Initialized. Mode: %1 (Foot: %2, Land: %3, Air: %4, Sea: %5)",GVAR(mode),GVAR(modeSelectiveFoot),GVAR(modeSelectiveLand), GVAR(modeSelectiveAir),GVAR(modeSelectiveSea));
+    INFO_5("View Restriction Module Initialized. Mode: %1 (Foot: %2, Land: %3, Air: %4, Sea: %5)",GVAR(mode),GVAR(modeSelectiveFoot),GVAR(modeSelectiveLand), GVAR(modeSelectiveAir),GVAR(modeSelectiveSea));
 } else {
-    ACE_LOGINFO_1("View Restriction Module Initialized. Mode: %1",GVAR(mode));
+    INFO_1("View Restriction Module Initialized. Mode: %1",GVAR(mode));
 };