diff options
| author | Max Horn | 2003-07-13 16:22:17 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-13 16:22:17 +0000 |
| commit | 963ecad36275f338fffb1619a0e8535016352d61 (patch) | |
| tree | c7eea83ae283decd62e2fcfb5ecd1fa3dca6c1dd /sky/music | |
| parent | 0642d2df98ed3b6c0251acf95b58674b1713bb9f (diff) | |
| download | scummvm-rg350-963ecad36275f338fffb1619a0e8535016352d61.tar.gz scummvm-rg350-963ecad36275f338fffb1619a0e8535016352d61.tar.bz2 scummvm-rg350-963ecad36275f338fffb1619a0e8535016352d61.zip | |
debug/warning/error all automatically output a newline
svn-id: r8991
Diffstat (limited to 'sky/music')
| -rw-r--r-- | sky/music/gmmusic.cpp | 2 | ||||
| -rw-r--r-- | sky/music/mt32music.cpp | 2 | ||||
| -rw-r--r-- | sky/music/musicbase.cpp | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp index 07c021a0c5..f274be95db 100644 --- a/sky/music/gmmusic.cpp +++ b/sky/music/gmmusic.cpp @@ -34,7 +34,7 @@ SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system) _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); if (midiRes != 0) { - error("Can't open midi device. Errorcode: %d\n",midiRes); + error("Can't open midi device. Errorcode: %d",midiRes); } _midiDrv->setTimerCallback(this, passTimerFunc); _ignoreNextPoll = false; diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp index 93d594de2d..22d40013d9 100644 --- a/sky/music/mt32music.cpp +++ b/sky/music/mt32music.cpp @@ -33,7 +33,7 @@ SkyMT32Music::SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *sys _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); if (midiRes != 0) { - error("Can't open midi device. Errorcode: %d\n",midiRes); + error("Can't open midi device. Errorcode: %d",midiRes); } _midiDrv->setTimerCallback(this, passTimerFunc); _ignoreNextPoll = false; diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp index def06fd536..60f189b0d0 100644 --- a/sky/music/musicbase.cpp +++ b/sky/music/musicbase.cpp @@ -69,25 +69,25 @@ bool SkyMusicBase::musicIsPlaying(void) void SkyMusicBase::musicCommand(uint16 command) { if (_musicData == NULL) { - debug(1,"Got music command but driver is not yet loaded.\n"); + debug(1,"Got music command but driver is not yet loaded"); return ; } if ((command >> 8) > _allowedCommands) { - debug(1,"got musicCommand %d while expecting <= %d\n", command >> 8, _allowedCommands); + debug(1,"got musicCommand %d while expecting <= %d", command >> 8, _allowedCommands); return ; } switch(command >> 8) { case 0: - debug(1,"SkyMusic: got call to startAdlibDriver(). Not necessary in this implementation.\n"); + debug(1,"SkyMusic: got call to startAdlibDriver(). Not necessary in this implementation."); break; case 1: - debug(1,"SkyMusic: got call to stopDriver(). Not necessary in this implementation.\n"); + debug(1,"SkyMusic: got call to stopDriver(). Not necessary in this implementation."); break; case 2: - debug(1,"SkyMusic: got call to SetTempo(). Tempo is fixed in this implementation.\n"); + debug(1,"SkyMusic: got call to SetTempo(). Tempo is fixed in this implementation."); break; case 3: - debug(1,"SkyMusic: ignored direct call to driverPoll().\n"); + debug(1,"SkyMusic: ignored direct call to driverPoll()."); break; case 4: startMusic(command&0xFF); @@ -102,7 +102,7 @@ void SkyMusicBase::musicCommand(uint16 command) setFMVolume(command&0xFF); break; default: - debug(1,"musicCommand %d ignored.\n",command>>8); + debug(1,"musicCommand %d ignored.",command>>8); } } @@ -134,7 +134,7 @@ void SkyMusicBase::loadNewMusic(void) { uint16 musicPos; if (_onNextPoll.musicToProcess > _musicData[_musicDataLoc]) { - error("Music %d requested but doesn't exist in file.\n", _onNextPoll.musicToProcess); + error("Music %d requested but doesn't exist in file.", _onNextPoll.musicToProcess); return; } if (_currentMusic != 0) |