Merge pull request #518 from CBATeam/use-new-logn-macros

use FORMAT log_N macros where possible
CBATeam · Oct 3, 2016 · d402055 · d402055
2 parents 98020cc + 7c73294
commit d402055
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/addons/keybinding/fnc_addKeybind.sqf b/addons/keybinding/fnc_addKeybind.sqf
@@ -66,8 +66,7 @@ if (_tooltip isEqualTo "") then {
 };
 
 if (count _defaultKeybind == 4) then {
-    _msg = format ["%1: %2 - Wrong format for the default keybind parameter. Use [DIK, [shift, ctrl, alt]]", _modName, _actionId];
-    WARNING(_msg);
+    WARNING_2("%1: %2 - Wrong format for the default keybind parameter. Use [DIK, [shift, ctrl, alt]]",_modName,_actionId);
     _modifiers=[_defaultKeybind select 1, _defaultKeybind select 2, _defaultKeybind select 3];
     _defaultKeybind = [_defaultKeybind select 0, _modifiers];
 };

diff --git a/addons/settings/XEH_preInit.sqf b/addons/settings/XEH_preInit.sqf
@@ -68,12 +68,10 @@ if (isServer) then {
     params ["_setting", "_value", ["_forced", false, [false]]];
 
     if ([_setting, "mission"] call FUNC(isForced)) exitWith {
-        private _message = format ["Setting %1 already forced, ignoring setSettingMission.", str _setting];
-        LOG(_message);
+        LOG_1("Setting %1 already forced, ignoring setSettingMission.",str _setting);
     };
     if (!([_setting, _value] call FUNC(check))) exitWith {
-        private _message = format ["Value %1 is invalid for setting %2.", _value, str _setting];
-        WARNING(_message);
+        WARNING_2("Value %1 is invalid for setting %2.",_value,str _setting);
     };
 
     GVAR(missionSettings) setVariable [_setting, [_value, _forced]];

diff --git a/addons/settings/fnc_init.sqf b/addons/settings/fnc_init.sqf
@@ -130,8 +130,7 @@ if (!isNil "_settingInfo") then {
     if !([_setting, _value] call FUNC(check)) then {
         _value = [_setting, "default"] call FUNC(get);
         [_setting, _value, _forced, "client"] call FUNC(set);
-        private _message = format ["Invalid value for setting %1. Fall back to default value.", str _setting];
-        WARNING(_message);
+        WARNING_1("Invalid value for setting %1. Fall back to default value.",str _setting);
     };
 
     GVAR(clientSettings) setVariable [_setting, [_value, _forced]];

diff --git a/addons/settings/fnc_parse.sqf b/addons/settings/fnc_parse.sqf
@@ -98,14 +98,12 @@ private _result = [];
         private _currentValue = [_setting, "default"] call FUNC(get);
 
         if (isNil "_currentValue") then {
-            private _message = format ["Error parsing settings file. Setting %1 does not exist.", str _setting];
-            ERROR(_message);
+            ERROR_1("Error parsing settings file. Setting %1 does not exist.",str _setting);
         } else {
             if ([_setting, _value] call FUNC(check)) then {
                 _result pushBack [_setting, _value, _force];
             } else {
-                private _message = format ["Error parsing settings file. Value %1 is invalid for setting %2.", _value, str _setting];
-                ERROR(_message);
+                ERROR_2("Error parsing settings file. Value %1 is invalid for setting %2.",_value,str _setting);
             };
         };
     };

diff --git a/addons/settings/fnc_set.sqf b/addons/settings/fnc_set.sqf
@@ -33,8 +33,7 @@ Author:
 params [["_setting", "", [""]], "_value", ["_forced", nil, [false]], ["_source", "client", [""]]];
 
 if (!isNil "_value" && {!([_setting, _value] call FUNC(check))}) exitWith {
-    private _message = format ["Value %1 is invalid for setting %2.", _value, str _setting];
-    WARNING(_message);
+    WARNING_2("Value %1 is invalid for setting %2.",_value,str _setting);
     1
 };