[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.38,1.39

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp 
Log Message:
improved fade param for dig demo

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dimuse.cpp	19 Jan 2004 17:37:14 -0000	1.38
+++ dimuse.cpp	19 Jan 2004 19:25:11 -0000	1.39
@@ -447,8 +447,13 @@
 		break;
 	case 14: // ImuseFadeParam
 		switch (sub_cmd) {
-		case 0x600: // set new volume with fading
-			setFade(soundId, d, e);
+		case 0x600: // set volume fading
+			if ((d != 0) && (e == 0))
+				setVolume(soundId, d);
+			else if ((d == 0) && (e == 0))
+				stopSound(soundId);
+			else
+				setFade(soundId, d, e);
 			break;
 		default:
 			warning("IMuseDigital::doCommand FadeParam DEFAULT sub command %d", sub_cmd);
@@ -465,11 +470,11 @@
 		debug(5, "ImuseSetState (%d)", b);
 		if ((_vm->_gameId == GID_DIG) && (_vm->_features & GF_DEMO)) {
 			if (b == 1) {
-				fadeOutMusic(120);
+				fadeOutMusic(200);
 				startMusic(1, false, 127, false);
 			} else {
 				if (getSoundStatus(2) == 0) {
-					fadeOutMusic(120);
+					fadeOutMusic(200);
 					startMusic(2, false, 127, false);
 				}
 			}