aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Göffringmann2005-11-12 11:26:24 +0000
committerRobert Göffringmann2005-11-12 11:26:24 +0000
commitfa5af9ce6d9560506ba02a49ce5ecec00af374ed (patch)
tree9af3190a5c497b545b0cddd2295ddbc197e59f3b
parent107a5d5b55fb6463745fcc839bf4e5b4ea953a98 (diff)
downloadscummvm-rg350-fa5af9ce6d9560506ba02a49ce5ecec00af374ed.tar.gz
scummvm-rg350-fa5af9ce6d9560506ba02a49ce5ecec00af374ed.tar.bz2
scummvm-rg350-fa5af9ce6d9560506ba02a49ce5ecec00af374ed.zip
Don't warn if 3m9.wav is missing. It always is.
svn-id: r19573
-rw-r--r--sword1/music.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sword1/music.cpp b/sword1/music.cpp
index a310115a3c..01715183d1 100644
--- a/sword1/music.cpp
+++ b/sword1/music.cpp
@@ -149,10 +149,8 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
sprintf(fileName, "%s.wav", fileBase);
if (_file.open(fileName))
_musicMode = MusicWave;
- else {
- warning("Music file %s could not be opened", fileName);
+ else
return false;
- }
}
_audioSource = createAudioSource();
_looping = loop;
@@ -329,6 +327,9 @@ void Music::startMusic(int32 tuneId, int32 loopFlag) {
_mutex.lock();
_converter[newStream] = Audio::makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
_mutex.unlock();
+ } else {
+ if (tuneId != 81) // file 81 was apparently removed from BS.
+ warning("Can't find music file %s", _tuneList[tuneId]);
}
} else {
_mutex.lock();