From deca7aa82140ae1b58f144ec23092fbc128694bb Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Mon, 3 Dec 2007 19:38:05 +0000
Subject: remove code duplication

svn-id: r29710
---
 engines/scumm/imuse_digi/dimuse_music.cpp | 15 +++++----------
 1 file 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) {
-- 
cgit v1.2.3