diff options
| author | Torbjörn Andersson | 2009-05-31 10:02:16 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2009-05-31 10:02:16 +0000 |
| commit | 0999534749f6c4edb9e4d054b95f185b829adba3 (patch) | |
| tree | 55744aee72afd7cc699213a88be65938e70fa0a0 /engines/scumm/imuse_digi | |
| parent | 3b311c65d0140e8bf727910d230ffd7a7f803761 (diff) | |
| download | scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.tar.gz scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.tar.bz2 scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.zip | |
The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)
svn-id: r41061
Diffstat (limited to 'engines/scumm/imuse_digi')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_bndmgr.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_codecs.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp index 780a9ad216..4577a11fe1 100644 --- a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp @@ -258,7 +258,7 @@ int32 BundleMgr::decompressSampleByIndex(int32 index, int32 offset, int32 size, assert(0 <= index && index < _numFiles); if (_file->isOpen() == false) { - error("BundleMgr::decompressSampleByIndex() File is not open!"); + error("BundleMgr::decompressSampleByIndex() File is not open"); return 0; } @@ -335,7 +335,7 @@ int32 BundleMgr::decompressSampleByName(const char *name, int32 offset, int32 si int32 final_size = 0; if (!_file->isOpen()) { - error("BundleMgr::decompressSampleByName() File is not open!"); + error("BundleMgr::decompressSampleByName() File is not open"); return 0; } diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp index 22796f3152..479a7a5470 100644 --- a/engines/scumm/imuse_digi/dimuse_codecs.cpp +++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp @@ -635,7 +635,7 @@ int32 decompressCodec(int32 codec, byte *compInput, byte *compOutput, int32 inpu break; default: - error("BundleCodecs::decompressCodec() Unknown codec %d!", (int)codec); + error("BundleCodecs::decompressCodec() Unknown codec %d", (int)codec); outputSize = 0; break; } diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index b18b0ba70f..10ebe093bf 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -673,7 +673,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte cmpFile = soundDesc->bundle->getFile(fileName, offs, len); if (len) { #ifndef USE_FLAC - error("FLAC library compiled support needed!"); + error("FLAC library compiled support needed"); #endif soundMode = 3; } @@ -682,7 +682,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte cmpFile = soundDesc->bundle->getFile(fileName, offs, len); if (len) { #ifndef USE_VORBIS - error("Vorbis library compiled support needed!"); + error("Vorbis library compiled support needed"); #endif soundMode = 2; } @@ -692,7 +692,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte cmpFile = soundDesc->bundle->getFile(fileName, offs, len); if (len) { #ifndef USE_MAD - error("Mad library compiled support needed!"); + error("Mad library compiled support needed"); #endif soundMode = 1; } |