Merge pull request #525 from CBATeam/make-ERROR_MSG-support-newlines

add support for \n to ERROR_MSG()
CBATeam · Oct 11, 2016 · caf0ca1 · caf0ca1
2 parents a4ecc39 + 6db7a79
commit caf0ca1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/addons/diagnostic/fnc_error.sqf b/addons/diagnostic/fnc_error.sqf
@@ -49,8 +49,7 @@ disableSerialization;
 QGVAR(Error) cutRsc [QGVAR(Error), "PLAIN"];
 private _control = uiNamespace getVariable QGVAR(Error);
 
-if (_message isEqualTo "") then {
-    _lines = [_title];
+if (_title isEqualTo "") then {
     _title = "ERROR";
 };
 

diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp
@@ -284,6 +284,8 @@ Macro: ERROR()
 Macro: ERROR_MSG()
     Record a critical error in the RPT log and display on screen error message.
 
+    Newlines (\n) in the MESSAGE will be put on separate lines.
+
 Parameters:
     MESSAGE -  Message to record <STRING>
 
@@ -295,7 +297,7 @@ Macro: ERROR_MSG()
 Author:
     commy2
 ------------------------------------------- */
-#define ERROR_MSG(MESSAGE) ['PREFIX', 'COMPONENT', MESSAGE, nil, __FILE__, __LINE__ + 1] call CBA_fnc_error
+#define ERROR_MSG(MESSAGE) ['PREFIX', 'COMPONENT', nil, MESSAGE, __FILE__, __LINE__ + 1] call CBA_fnc_error
 #define ERROR_MSG_1(MESSAGE,ARG1) ERROR_MSG(FORMAT_1(MESSAGE,ARG1))
 #define ERROR_MSG_2(MESSAGE,ARG1,ARG2) ERROR_MSG(FORMAT_2(MESSAGE,ARG1,ARG2))
 #define ERROR_MSG_3(MESSAGE,ARG1,ARG2,ARG3) ERROR_MSG(FORMAT_3(MESSAGE,ARG1,ARG2,ARG3))