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

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Mon Dec 3 20:38:05 CET 2007


Revision: 29710
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29710&view=rev
Author:   aquadran
Date:     2007-12-03 11:38:05 -0800 (Mon, 03 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-03 12:26:45 UTC (rev 29709)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2007-12-03 19:38:05 UTC (rev 29710)
@@ -105,19 +105,14 @@
 		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) {


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




More information about the Scummvm-git-logs mailing list