[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.3,2.4

Jamieson Christian jamieson630 at users.sourceforge.net
Sat May 24 09:02:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7454/scummvm/scumm

Modified Files:
	imuse_player.cpp 
Log Message:
Fix for bug [742688] FOA: Missing music at Sophia's lecture.
Added check for 0-length parameter fades, just in case.

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- imuse_player.cpp	23 May 2003 18:35:53 -0000	2.3
+++ imuse_player.cpp	24 May 2003 16:00:18 -0000	2.4
@@ -1063,7 +1063,10 @@
 		best->param = param;
 		best->start = start;
 		best->end = target;
-		best->total_time = (uint32) time * 10000;
+		if (!time)
+			best->total_time = 1;
+		else
+			best->total_time = (uint32) time * 10000;
 		best->current_time = 0;
 	} else {
 		warning ("IMuse Player %d: Out of parameter faders", _id);
@@ -1091,7 +1094,7 @@
 		switch (ptr->param) {
 		case ParameterFader::pfVolume:
 			// Volume.
-			if (!value) {
+			if (!value && !ptr->end) {
 				clear();
 				return;
 			}





More information about the Scummvm-git-logs mailing list