aboutsummaryrefslogtreecommitdiff
path: root/queen/music.cpp
diff options
context:
space:
mode:
authorJoost Peters2004-12-23 04:59:44 +0000
committerJoost Peters2004-12-23 04:59:44 +0000
commit88b0fb396a1c147418f4a0ce396f32e0cf86898f (patch)
treec8083ba49fe9c15b05f012ca93c264f031a770a3 /queen/music.cpp
parent929537cecb331098cb62336ee8c2573a3ed4e4da (diff)
downloadscummvm-rg350-88b0fb396a1c147418f4a0ce396f32e0cf86898f.tar.gz
scummvm-rg350-88b0fb396a1c147418f4a0ce396f32e0cf86898f.tar.bz2
scummvm-rg350-88b0fb396a1c147418f4a0ce396f32e0cf86898f.zip
songs > 1000 are special commands which shouldn't be ignored. fixes a rather nasty regression in fotaq.
svn-id: r16272
Diffstat (limited to 'queen/music.cpp')
-rw-r--r--queen/music.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/queen/music.cpp b/queen/music.cpp
index a819167578..c52974a757 100644
--- a/queen/music.cpp
+++ b/queen/music.cpp
@@ -79,7 +79,7 @@ static const byte mt32_to_gm[128] = {
}
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);