[Scummvm-git-logs] scummvm master -> cd66f4bd71a83da0cda46e35c38fefe80a59bcf3

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cd66f4bd71 ULTIMA: NUVIE: Remove excess CRs from log entries


Commit: cd66f4bd71a83da0cda46e35c38fefe80a59bcf3
    https://github.com/scummvm/scummvm/commit/cd66f4bd71a83da0cda46e35c38fefe80a59bcf3
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-11-19T12:43:58+11:00

Commit Message:
ULTIMA: NUVIE: Remove excess CRs from log entries

Changed paths:
    engines/ultima/nuvie/core/nuvie_defs.cpp
    engines/ultima/nuvie/gui/widgets/console.cpp
    engines/ultima/nuvie/script/script.cpp


diff --git a/engines/ultima/nuvie/core/nuvie_defs.cpp b/engines/ultima/nuvie/core/nuvie_defs.cpp
index 7b9c133c18b..62dc9bd2234 100644
--- a/engines/ultima/nuvie/core/nuvie_defs.cpp
+++ b/engines/ultima/nuvie/core/nuvie_defs.cpp
@@ -32,7 +32,7 @@ void u6debug(bool no_header, const DebugLevelType level, const char *format, ...
 	Common::String output = Common::String::vformat(format, va);
 	va_end(va);
 
-	::debug(level, "%s", output.c_str());
+	::debugN(level, "%s", output.c_str());
 }
 
 #endif
diff --git a/engines/ultima/nuvie/gui/widgets/console.cpp b/engines/ultima/nuvie/gui/widgets/console.cpp
index 788c8c6a874..f46f9bd9411 100644
--- a/engines/ultima/nuvie/gui/widgets/console.cpp
+++ b/engines/ultima/nuvie/gui/widgets/console.cpp
@@ -83,14 +83,14 @@ void ConsoleAddInfo(const char *format, ...) {
 	va_end(args);
 
 	if (g_console != NULL) {
-		DEBUG(0, LEVEL_INFORMATIONAL, buf);
+		DEBUG(0, LEVEL_INFORMATIONAL, "%s\n", buf);
 		g_console->AddLine(buf);
 	}
 }
 
 void ConsoleAddError(Std::string s) {
 	if (g_console != NULL) {
-		DEBUG(0, LEVEL_ERROR, s.c_str());
+		DEBUG(0, LEVEL_ERROR, "%s\n", s.c_str());
 		g_console->Show();
 		g_console->AddLine("Error: " + s);
 	}
@@ -98,10 +98,11 @@ void ConsoleAddError(Std::string s) {
 
 void ConsoleAddWarning(Std::string s) {
 	if (g_console != NULL) {
-		DEBUG(0, LEVEL_WARNING, s.c_str());
+		DEBUG(0, LEVEL_WARNING, "%s\n", s.c_str());
 		g_console->AddLine("Warning: " + s);
 	}
 }
+
 void ConsolePause() {
 	if (g_console == NULL)
 		return;
diff --git a/engines/ultima/nuvie/script/script.cpp b/engines/ultima/nuvie/script/script.cpp
index 761169ff614..d917c5107f1 100644
--- a/engines/ultima/nuvie/script/script.cpp
+++ b/engines/ultima/nuvie/script/script.cpp
@@ -1282,7 +1282,7 @@ bool Script::call_magic_get_spell_list(Spell **spell_list) {
 
 		if (num < 256 && spell_list[num] == NULL) {
 			spell_list[num] = new Spell((uint8)num, (const char *)name, (const char *)invocation, re);
-			::debug(1, "num = %d, reagents = %d, name = %s invocation = %s\n", num, re, name, invocation);
+			::debug(1, "num = %d, reagents = %d, name = %s invocation = %s", num, re, name, invocation);
 		}
 
 		lua_pop(L, 1);