[Scummvm-cvs-logs] SF.net SVN: scummvm: [29714] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_music.cpp

[aquadran at users.sourceforge.net]

Revision: 29714
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29714&view=rev
Author:   aquadran
Date:     2007-12-04 03:45:20 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
remove code duplication

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-12-04 08:18:43 UTC (rev 29713)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-12-04 11:45:20 UTC (rev 29714)
@@ -243,17 +243,11 @@
 		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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.