[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.27,1.28
Joost Peters
joostp at users.sourceforge.net
Wed Dec 22 21:00:36 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20588/queen
Modified Files:
music.cpp
Log Message:
songs > 1000 are special commands which shouldn't be ignored. fixes a rather nasty regression in fotaq.
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- music.cpp 21 Dec 2004 13:26:50 -0000 1.27
+++ music.cpp 23 Dec 2004 04:59:44 -0000 1.28
@@ -79,7 +79,7 @@
}
bool MusicPlayer::queueSong(uint16 songNum) {
- if (songNum >= _numSongs) {
+ if (songNum >= _numSongs && songNum < 1000) {
// this happens at the end of the car chase, where we try to play song 176,
// see Sound::_tune[], entry 39
warning("Trying to queue an invalid song number %d, max %d", songNum, _numSongs);
More information about the Scummvm-git-logs
mailing list