[Scummvm-cvs-logs] CVS: scummvm/sword1 music.cpp,1.50,1.51
Robert Göffringmann
lavosspawn at users.sourceforge.net
Sat Nov 12 03:27:07 CET 2005
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23526/sword1
Modified Files:
music.cpp
Log Message:
Don't warn if 3m9.wav is missing. It always is.
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- music.cpp 20 Oct 2005 13:08:43 -0000 1.50
+++ music.cpp 12 Nov 2005 11:26:24 -0000 1.51
@@ -149,10 +149,8 @@
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 @@
_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();
More information about the Scummvm-git-logs
mailing list