diff options
| author | Paweł Kołodziejski | 2007-12-03 19:38:05 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2007-12-03 19:38:05 +0000 |
| commit | deca7aa82140ae1b58f144ec23092fbc128694bb (patch) | |
| tree | 991026be8e6882e7bf2f25bb9b4ca8c0c6dbd06f | |
| parent | 8713d1f7dbffc632f01e8a16491d6fff9ad68775 (diff) | |
| download | scummvm-rg350-deca7aa82140ae1b58f144ec23092fbc128694bb.tar.gz scummvm-rg350-deca7aa82140ae1b58f144ec23092fbc128694bb.tar.bz2 scummvm-rg350-deca7aa82140ae1b58f144ec23092fbc128694bb.zip | |
remove code duplication
svn-id: r29710
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_music.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp index af4966b2ff..a67d3734b9 100644 --- a/engines/scumm/imuse_digi/dimuse_music.cpp +++ b/engines/scumm/imuse_digi/dimuse_music.cpp @@ -105,19 +105,14 @@ void IMuseDigital::setDigMusicSequence(int seqId) { return; if (num != 0) { - if (_curMusicSeq == 0) { + if (_curMusicSeq && (_digSeqMusicTable[_curMusicSeq].transitionType == 4) + || (_digSeqMusicTable[_curMusicSeq].transitionType == 6)) { + _nextSeqToPlay = num; + return; + } else { playDigMusic(_digSeqMusicTable[num].name, &_digSeqMusicTable[num], 0, true); _nextSeqToPlay = 0; _attributes[DIG_SEQ_OFFSET + num] = 1; - } else { - if ((_digSeqMusicTable[_curMusicSeq].transitionType == 4) || (_digSeqMusicTable[_curMusicSeq].transitionType == 6)) { - _nextSeqToPlay = num; - return; - } else { - playDigMusic(_digSeqMusicTable[num].name, &_digSeqMusicTable[num], 0, true); - _nextSeqToPlay = 0; - _attributes[DIG_SEQ_OFFSET + num] = 1; - } } } else { if (_nextSeqToPlay != 0) { |