[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.11,2.12

Jamieson Christian jamieson630 at users.sourceforge.net
Sun Jun 1 12:17:04 CEST 2003


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

Modified Files:
	imuse_player.cpp 
Log Message:
Hack to fix odd usage of the ParameterFader
in S&M around the dinosaurs.

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- imuse_player.cpp	31 May 2003 13:38:41 -0000	2.11
+++ imuse_player.cpp	1 Jun 2003 19:16:34 -0000	2.12
@@ -982,6 +982,16 @@
 
 	switch (param) {
 	case ParameterFader::pfVolume:
+		// HACK: If volume is set to 0 with 0 time,
+		// set it so immediately but DON'T clear
+		// the player. This fixes a problem with
+		// music being cleared inappropriately
+		// in S&M when playing with the Dinosaur.
+		if (!target && !time) {
+			setVolume (0);
+			return 0;
+		}
+
 		// Volume fades are handled differently.
 		start = _volume;
 		break;





More information about the Scummvm-git-logs mailing list