From 9a699c97050007355a709ccddbc86ce8c1ad04b4 Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Thu, 17 Jan 2008 21:46:17 +0000 Subject: reduction a bit of code svn-id: r30538 --- engines/scumm/imuse_digi/dimuse_music.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'engines') diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp index ca42633925..a43e93dcad 100644 --- a/engines/scumm/imuse_digi/dimuse_music.cpp +++ b/engines/scumm/imuse_digi/dimuse_music.cpp @@ -308,13 +308,6 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab setHookIdForMusic(table->hookId); break; case 2: - if (table->filename[0] == 0) { - fadeOutMusic(60); - return; - } - fadeOutMusic(table->fadeOutDelay); - startMusic(table->filename, table->soundId, table->hookId, 127); - break; case 3: case 4: case 12: @@ -324,6 +317,11 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab } if (table->transitionType == 4) _stopingSequence = true; + if (table->transitionType == 2) { + fadeOutMusic(table->fadeOutDelay); + startMusic(table->filename, table->soundId, table->hookId, 127); + return; + } if ((!sequence) && (table->attribPos != 0) && (table->attribPos == _comiStateMusicTable[_curMusicState].attribPos)) { fadeOutMusicAndStartNew(table->fadeOutDelay, table->filename, table->soundId); -- cgit v1.2.3