[Scummvm-cvs-logs] CVS: residual/imuse imuse_script.cpp,1.11,1.12

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16810/imuse

Modified Files:
	imuse_script.cpp 
Log Message:
changed checks in imuse at the end of sound

Index: imuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_script.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imuse_script.cpp	14 Jan 2005 21:06:58 -0000	1.11
+++ imuse_script.cpp	21 Jan 2005 20:34:42 -0000	1.12
@@ -76,7 +76,7 @@
 int32 Imuse::getPosIn60HzTicks(const char *soundName) {
 	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {
 		Track *track = _track[l];
-		if (track->used && !track->toBeRemoved && (strcmp(track->soundName, soundName) == 0)) {
+		if (track->handle.isActive() && (strcmp(track->soundName, soundName) == 0)) {
 			int32 pos = (5 * (track->dataOffset + track->regionOffset)) / (track->iteration / 12);
 			return pos;
 		}
@@ -89,7 +89,7 @@
 	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {
 		Track *track = _track[l];
 		if (track->volGroupId == IMUSE_VOLGRP_VOICE) {
-			if (track->handle.isActive() || (track->stream && track->used && !track->readyToRemove)) {
+			if (track->handle.isActive()) {
 				return true;
 			}
 		}
@@ -102,7 +102,7 @@
 	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {
 		Track *track = _track[l];
 		if (strcmp(track->soundName, soundName) == 0) {
-			if (track->handle.isActive() || (track->stream && track->used && !track->readyToRemove)) {
+			if (track->handle.isActive()) {
 				return true;
 			}
 		}