diff options
| -rw-r--r-- | scumm/sound.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index bce9a92410..dfc14957dd 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -255,7 +255,7 @@ void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) { strcpy(buf, buf1); } if (musicFile.open(buf) == false) { - error("playSound: Can't open music file %s", buf); + warning("playSound: Can't open music file %s", buf); return; } if (!getHEMusicDetails(soundID, music_offs, size)) { @@ -514,7 +514,7 @@ void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) { ptr += 0x20; size -= 0x20; if (size < waveSize) { - error("Wrong wave size in sound #%i: %i", soundID, waveSize); + warning("Wrong wave size in sound #%i: %i", soundID, waveSize); waveSize = size; } sound = (char *)malloc(waveSize); @@ -749,7 +749,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle else if (offset == 79) strcpy(roomname, "newton"); else { - error("startTalkSound: dig demo: unknown room number: %d", offset); + warning("startTalkSound: dig demo: unknown room number: %d", offset); return; } @@ -761,13 +761,13 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle _vm->openFile(*_sfxFile, filename); } if (!_sfxFile->isOpen()) { - error("startTalkSound: dig demo: voc file not found"); + warning("startTalkSound: dig demo: voc file not found"); return; } } else { if (!_sfxFile->isOpen()) { - error("startTalkSound: SFX file is not open"); + warning("startTalkSound: SFX file is not open"); return; } @@ -792,11 +792,11 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle sizeof(MP3OffsetTable), compareMP3OffsetTable); if (result == NULL) { - error("startTalkSound: did not find sound at offset %d !", offset); + warning("startTalkSound: did not find sound at offset %d !", offset); return; } if (2 * num != result->num_tags) { - error("startTalkSound: number of tags do not match (%d - %d) !", b, + warning("startTalkSound: number of tags do not match (%d - %d) !", b, result->num_tags); num = result->num_tags; } @@ -846,7 +846,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle } if (!input) { - error("startSfxSound failed to load sound"); + warning("startSfxSound failed to load sound"); return; } |