[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.25.2.2,1.25.2.3

Joost Peters joostp at users.sourceforge.net
Wed Dec 22 20:54:08 CET 2004


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20222/queen

Modified Files:
      Tag: branch-0-7-0
	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.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- music.cpp	21 Dec 2004 13:27:43 -0000	1.25.2.2
+++ music.cpp	23 Dec 2004 04:53:11 -0000	1.25.2.3
@@ -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