diff options
| author | Torbjörn Andersson | 2005-09-19 06:49:29 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-09-19 06:49:29 +0000 |
| commit | 98c40b69aa3758e10da79a9fd435c506f24f7669 (patch) | |
| tree | c78dce32906af3844c8cec8e0d83d17d30592a70 | |
| parent | 0d3e20e4781b38e98ab05e5ee20c0b9425f01509 (diff) | |
| download | scummvm-rg350-98c40b69aa3758e10da79a9fd435c506f24f7669.tar.gz scummvm-rg350-98c40b69aa3758e10da79a9fd435c506f24f7669.tar.bz2 scummvm-rg350-98c40b69aa3758e10da79a9fd435c506f24f7669.zip | |
Fixed bug #1294660, using aquadran's suggested solution.
svn-id: r18847
| -rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index 041da01b6f..e755c4f829 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -193,7 +193,14 @@ void IMuseDigital::playDigMusic(const char *songName, const imuseDigTable *table void IMuseDigital::setComiMusicState(int stateId) { int l, num = -1; - if ((stateId == 0) || (stateId == 4)) + // This happens at the beginning of Part II, but should apparently not + // do anything since the correct music is already playing. A left-over + // of some kind? + + if (stateId == 4) + return; + + if (stateId == 0) stateId = 1000; for (l = 0; _comiStateMusicTable[l].soundId != -1; l++) { |