diff options
| author | Paweł Kołodziejski | 2007-12-04 11:45:20 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2007-12-04 11:45:20 +0000 |
| commit | a8b5484086452c09aeb017052f15b4c1591b1366 (patch) | |
| tree | 506180d27a9c2de08f26e5f4ca481caa7680f309 | |
| parent | 4c36219beaff904f8728553d248f241d1c6f7a7a (diff) | |
| download | scummvm-rg350-a8b5484086452c09aeb017052f15b4c1591b1366.tar.gz scummvm-rg350-a8b5484086452c09aeb017052f15b4c1591b1366.tar.bz2 scummvm-rg350-a8b5484086452c09aeb017052f15b4c1591b1366.zip | |
remove code duplication
svn-id: r29714
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_music.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp index d63ccc2dce..b92b948c2e 100644 --- a/engines/scumm/imuse_digi/dimuse_music.cpp +++ b/engines/scumm/imuse_digi/dimuse_music.cpp @@ -243,17 +243,11 @@ void IMuseDigital::setComiMusicSequence(int seqId) { return; if (num != 0) { - if (_curMusicSeq == 0) { + if (_curMusicSeq && ((_comiSeqMusicTable[_curMusicSeq].transitionType == 4) || (_comiSeqMusicTable[_curMusicSeq].transitionType == 6))) { + _nextSeqToPlay = num; + } else { playComiMusic(_comiSeqMusicTable[num].name, &_comiSeqMusicTable[num], 0, true); _nextSeqToPlay = 0; - } else { - if ((_comiSeqMusicTable[_curMusicSeq].transitionType == 4) || (_comiSeqMusicTable[_curMusicSeq].transitionType == 6)) { - _nextSeqToPlay = num; - return; - } else { - playComiMusic(_comiSeqMusicTable[num].name, &_comiSeqMusicTable[num], 0, true); - _nextSeqToPlay = 0; - } } } else { if (_nextSeqToPlay != 0) { |