[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.3,1.4 smush_player.cpp,1.18,1.19

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv31203/smush

Modified Files:
	smush_mixer.cpp smush_player.cpp 
Log Message:
warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smush_mixer.cpp	30 Apr 2003 11:26:36 -0000	1.3
+++ smush_mixer.cpp	18 May 2003 21:14:50 -0000	1.4
@@ -59,7 +59,7 @@
 
 	for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
 		if(_channels[i].id == track)
-			warning("SmushMixer::addChannel(%d) : channel already exist !", track);
+			warning("SmushMixer::addChannel(%d) : channel already exists", track);
 	}
 	if(_nextIndex >= SoundMixer::NUM_CHANNELS)
 		_nextIndex = _mixer->_beginSlots;
@@ -84,10 +84,10 @@
 		}
 	}
 
-	warning("_nextIndex == %d\n", _nextIndex);
+	warning("_nextIndex == %d", _nextIndex);
 
 	for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
-		warning("channel %d : %p(%d, %d) %d %d\n", i, (void *)_channels[i].chan, 
+		warning("channel %d : %p(%d, %d) %d %d", i, (void *)_channels[i].chan, 
 			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1, 
 			_channels[i].chan ? _channels[i].chan->isTerminated() : 1, 
 			_channels[i].first, _channels[i].mixer_index);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- smush_player.cpp	12 May 2003 22:08:39 -0000	1.18
+++ smush_player.cpp	18 May 2003 21:14:50 -0000	1.19
@@ -584,7 +584,7 @@
 			sf->drawStringWrapCentered(string2, _data, _width, _height, pos_x, MAX(pos_y, top), width);
 			break;
 		default:
-			warning("SmushPlayer::handleTextResource. Not handled flags: %d\n", flags);
+			warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
 	}
 
 	if (string != NULL) {