diff options
| author | Paweł Kołodziejski | 2004-04-08 21:59:40 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-04-08 21:59:40 +0000 |
| commit | 6da153dc123207c4450232e3297d636a15deb143 (patch) | |
| tree | 89066d0d10de2df768fbe0f9012d9342b1c10ed5 /scumm | |
| parent | 83b7d7f84ca7f8c56288518883abe0a2898334df (diff) | |
| download | scummvm-rg350-6da153dc123207c4450232e3297d636a15deb143.tar.gz scummvm-rg350-6da153dc123207c4450232e3297d636a15deb143.tar.bz2 scummvm-rg350-6da153dc123207c4450232e3297d636a15deb143.zip | |
fix for music code
svn-id: r13502
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index 1c8e826b3f..c94c95f489 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -198,11 +198,10 @@ void IMuseDigital::playDigMusic(const char *songName, const imuseDigTable *table break; case 3: case 4: - if ((!sequence) && (table->param != 0)) { - if (table->param == _digStateMusicTable[_curMusicState].param) { - startMusic(table->filename, table->soundId, 0, 127); - return; - } + if ((!sequence) && (table->param != 0) && + (table->param == _digStateMusicTable[_curMusicState].param)) { + startMusic(table->filename, table->soundId, 0, 127); + return; } startMusic(table->filename, table->soundId, hookId, 127); break; @@ -330,10 +329,9 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab case 4: case 12: fadeOutMusic(table->fadeOut60TicksDelay); - if ((!sequence) && (table->param != 0)) { - if (table->param == _comiStateMusicTable[_curMusicState].param) { - startMusic(table->filename, table->soundId, 0, 127); - } + if ((!sequence) && (table->param != 0) && + (table->param == _comiStateMusicTable[_curMusicState].param)) { + startMusic(table->filename, table->soundId, 0, 127); } else { if (table->opcode == 12) { startMusic(table->filename, table->soundId, table->hookId, 127); |