[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_script.cpp,1.7.2.1,1.7.2.2 dimuse_track.cpp,1.17.2.1,1.17.2.2

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon May 3 04:33:14 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132

Modified Files:
      Tag: branch-0-6-0
	dimuse_script.cpp dimuse_track.cpp 
Log Message:
synced same as in head

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- dimuse_script.cpp	2 May 2004 16:36:04 -0000	1.7.2.1
+++ dimuse_script.cpp	3 May 2004 11:32:49 -0000	1.7.2.2
@@ -278,7 +278,7 @@
 	int soundId = -1;
 
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
-		if ((_track[l]->volGroupId == IMUSE_VOLGRP_MUSIC) && _track[l]->used) {
+		if ((_track[l]->used) && (_track[l]->volGroupId == IMUSE_VOLGRP_MUSIC)) {
 			soundId = _track[l]->soundId;
 		}
 	}
@@ -331,7 +331,7 @@
 	int soundId = -1;
 
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
-		if ((_track[l]->volGroupId == IMUSE_VOLGRP_MUSIC) && _track[l]->used) {
+		if ((_track[l]->used) && (_track[l]->volGroupId == IMUSE_VOLGRP_MUSIC)) {
 			soundId = _track[l]->soundId;
 		}
 	}

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- dimuse_track.cpp	2 May 2004 16:36:04 -0000	1.17.2.1
+++ dimuse_track.cpp	3 May 2004 11:32:49 -0000	1.17.2.2
@@ -239,7 +239,7 @@
 	Common::StackLock lock(_mutex);
 	debug(5, "IMuseDigital::fadeOutMusic");
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
-		if ((_track[l]->volGroupId == IMUSE_VOLGRP_MUSIC) && _track[l]->used) {
+		if ((_track[l]->used) && (_track[l]->volGroupId == IMUSE_VOLGRP_MUSIC)) {
 			cloneToFadeOutTrack(l, fadeDelay, true);
 		}
 	}
@@ -251,7 +251,7 @@
 	int fadeTrack = -1;
 
 	for (int l = MAX_DIGITAL_TRACKS; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
-		if (!_track[l]->used && !_track[l]->handle.isActive()) {
+		if (!_track[l]->used) {
 			fadeTrack = l;
 			break;
 		}





More information about the Scummvm-git-logs mailing list