aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush/smush_mixer.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-18 21:14:50 +0000
committerMax Horn2003-05-18 21:14:50 +0000
commit5ac005860c3444ee881a2a448aa7481bdc37851b (patch)
tree697690970fd7c171b305060622eadf425a83b712 /scumm/smush/smush_mixer.cpp
parent7171c5bcd4063be192c94be93555b15f9eb59622 (diff)
downloadscummvm-rg350-5ac005860c3444ee881a2a448aa7481bdc37851b.tar.gz
scummvm-rg350-5ac005860c3444ee881a2a448aa7481bdc37851b.tar.bz2
scummvm-rg350-5ac005860c3444ee881a2a448aa7481bdc37851b.zip
warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')
svn-id: r7647
Diffstat (limited to 'scumm/smush/smush_mixer.cpp')
-rw-r--r--scumm/smush/smush_mixer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 33211f0d05..69eb686ce9 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -59,7 +59,7 @@ bool SmushMixer::addChannel(SmushChannel *c) {
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 @@ bool SmushMixer::addChannel(SmushChannel *c) {
}
}
- 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);