[Scummvm-git-logs] scummvm master -> 5f3e2bd0724c219b3d06f998137970f4671901fd

[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:
5f3e2bd072 NUVIE: Remove excess CRs from debug messages


Commit: 5f3e2bd0724c219b3d06f998137970f4671901fd
    https://github.com/scummvm/scummvm/commit/5f3e2bd0724c219b3d06f998137970f4671901fd
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-26T11:52:51+09:00

Commit Message:
NUVIE: Remove excess CRs from debug messages

Changed paths:
    engines/ultima/nuvie/misc/u6_misc.cpp
    engines/ultima/nuvie/sound/adplug/mid.cpp
    engines/ultima/nuvie/sound/origin_fx_adib_driver.cpp


diff --git a/engines/ultima/nuvie/misc/u6_misc.cpp b/engines/ultima/nuvie/misc/u6_misc.cpp
index bb0f469970..6164d225b3 100644
--- a/engines/ultima/nuvie/misc/u6_misc.cpp
+++ b/engines/ultima/nuvie/misc/u6_misc.cpp
@@ -135,7 +135,7 @@ bool find_path(Std::string path, Std::string &dir_str) {
 		return false;
 
 	for (item = readdir(dir); item != NULL; item = readdir(dir)) {
-		debug("trying %s, want %s\n", item->d_name, dir_str.c_str());
+		debug("trying %s, want %s", item->d_name, dir_str.c_str());
 		if (strlen(item->d_name) == dir_str.length() && Common::scumm_stricmp(item->d_name, dir_str.c_str()) == 0) {
 			dir_str = item->d_name;
 			return true;
diff --git a/engines/ultima/nuvie/sound/adplug/mid.cpp b/engines/ultima/nuvie/sound/adplug/mid.cpp
index d959a72ac5..993f617c68 100644
--- a/engines/ultima/nuvie/sound/adplug/mid.cpp
+++ b/engines/ultima/nuvie/sound/adplug/mid.cpp
@@ -223,7 +223,7 @@ bool CmidPlayer::update() {
 				//  This is to do implied MIDI events. aka 'Running Status'
 				if (v < 0x80) {
 					v = track[curtrack].pv;
-					debug("Running status [%2X]\n", (unsigned int)v);
+					debug("Running status [%2X]", (unsigned int)v);
 					pos--;
 				} else {
 					if (v >= 0xf0 && v < 0xf9) {
@@ -373,12 +373,12 @@ bool CmidPlayer::update() {
 							for (i = 0; i < l; i++)
 								midiprintf("%c", (unsigned char)getnext(1));
 						} else if (v == 0x6) {
-							debug("Marker: ");
+							debugN("Marker: ");
 							for (i = 0; i < l; i++) {
 								//midiprintf ("%c",(unsigned char)getnext(1));
-								debug("%c", (unsigned char)getnext(1));
+								debugN("%c", (unsigned char)getnext(1));
 							}
-							debug("\n");
+							debug("");
 						} else {
 							for (i = 0; i < l; i++)
 								midiprintf("%2X ", (unsigned int)getnext(1));
diff --git a/engines/ultima/nuvie/sound/origin_fx_adib_driver.cpp b/engines/ultima/nuvie/sound/origin_fx_adib_driver.cpp
index ddb8011927..126809fe26 100644
--- a/engines/ultima/nuvie/sound/origin_fx_adib_driver.cpp
+++ b/engines/ultima/nuvie/sound/origin_fx_adib_driver.cpp
@@ -146,7 +146,7 @@ void OriginFXAdLibDriver::program_change(sint8 channel, uint8 program_number) {
 	unsigned char *tim_data = get_tim_data(program_number);
 	int i, j;
 
-	debug("Program change channel: %d program: %d\n", channel, program_number);
+	debug("Program change channel: %d program: %d", channel, program_number);
 	for (i = 0; i < 11; i++) {
 		if (adlib_ins[i].channel == channel) {
 			play_note(channel, adlib_ins[i].note, 0); //note off.
@@ -187,7 +187,7 @@ void OriginFXAdLibDriver::pitch_bend(uint8 channel, uint8 pitch_lsb, uint8 pitch
 	unsigned char *cur_tim_ptr = midi_chan_tim_ptr[channel];
 
 	midi_chan_pitch[channel] = ((sint16)((pitch_msb << 7) + pitch_lsb - 8192) * cur_tim_ptr[0xe]) / 256;
-	debug("pitch_bend: c=%d, pitch=%d %d,%d,%d\n", channel, midi_chan_pitch[channel], pitch_msb, pitch_lsb, cur_tim_ptr[0xe]);
+	debug("pitch_bend: c=%d, pitch=%d %d,%d,%d", channel, midi_chan_pitch[channel], pitch_msb, pitch_lsb, cur_tim_ptr[0xe]);
 
 	for (int i = 0; i < adlib_num_active_channels; i++) {
 		if (adlib_ins[i].byte_68 > 1 && adlib_ins[i].channel == channel) {
@@ -208,7 +208,7 @@ void OriginFXAdLibDriver::pitch_bend(uint8 channel, uint8 pitch_lsb, uint8 pitch
 
 void OriginFXAdLibDriver::control_mode_change(uint8 channel, uint8 function, uint8 value) {
 	uint8 c = channel;
-	debug("control_mode_change: c=%d, func=%2x, value=%d\n", channel, function, value);
+	debug("control_mode_change: c=%d, func=%2x, value=%d", channel, function, value);
 	if (c == 9) {
 		c++;
 		do {