[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.5,1.6 script_v8.cpp,2.99,2.100

[James Brown]

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

Modified Files:
	imuse_digi.cpp script_v8.cpp 
Log Message:
Disable smush again, and apply patch 664890 ('Silencing the music')


Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse_digi.cpp	29 Dec 2002 01:28:44 -0000	1.5
+++ imuse_digi.cpp	9 Jan 2003 08:23:44 -0000	1.6
@@ -1031,6 +1031,8 @@
 					tmp /= 2;
 				}
 				_channel[chan]._volumeFadeStep = tmp;
+				printf("volumeFade is %d, step is %d\n", d, tmp);
+
 				return 0;
 			default:
 				warning("IMuseDigital::doCommand 14 DEFAULT sub command %d", sub_cmd);
@@ -1059,6 +1061,12 @@
 					}
 				}
 			} else if (_scumm->_gameId == GID_CMI) {
+				if (b == 1000) {		// STATE_NULL
+					// FIXME: Fade this out properly, in the same increments as the real engine
+					_scumm->_sound->stopBundleMusic();
+					return 0;
+				}
+
 				for(l = 0;; l++) {
 					if (_comiStateMusicTable[l].index == -1) {
 						return 1;

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.99
retrieving revision 2.100
diff -u -d -r2.99 -r2.100
--- script_v8.cpp	9 Jan 2003 08:06:35 -0000	2.99
+++ script_v8.cpp	9 Jan 2003 08:23:44 -0000	2.100
@@ -1310,9 +1310,9 @@
 	
 	warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer);
 	
-	ScummRenderer * sr = new ScummRenderer(this, 1000/14);
-	SmushPlayer * sp = new SmushPlayer(sr);
-	sp->play((char*)_scriptPointer, getGameDataPath());
+	//ScummRenderer * sr = new ScummRenderer(this, 1000/14);
+	//SmushPlayer * sp = new SmushPlayer(sr);
+	//sp->play((char*)_scriptPointer, getGameDataPath());
 	
 	_scriptPointer += len + 1;
 }