[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.293.2.10,1.293.2.11 scumm.h,1.369.2.4,1.369.2.5 scummvm.cpp,2.577.2.16,2.577.2.17

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Jun 26 02:19:12 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12615/scummvm/scumm

Modified Files:
      Tag: branch-0-6-0
	script_v6.cpp scumm.h scummvm.cpp 
Log Message:
backported imuse digital and smush changes

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.293.2.10
retrieving revision 1.293.2.11
diff -u -d -r1.293.2.10 -r1.293.2.11
--- script_v6.cpp	20 Jun 2004 14:43:22 -0000	1.293.2.10
+++ script_v6.cpp	26 Jun 2004 09:18:28 -0000	1.293.2.11
@@ -2497,8 +2497,10 @@
 					const int insaneVarNum = ((_features & GF_DEMO) && (_features & GF_PC)) 
 						? 232 : 233;
 
+					_insaneRunning = true;
 					_insane->setSmushParams(speed);
 					_insane->runScene(insaneVarNum);
+					_insaneRunning = false;
 				}
 			}
 			break;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.369.2.4
retrieving revision 1.369.2.5
diff -u -d -r1.369.2.4 -r1.369.2.5
--- scumm.h	3 May 2004 10:57:46 -0000	1.369.2.4
+++ scumm.h	26 Jun 2004 09:18:28 -0000	1.369.2.5
@@ -358,7 +358,8 @@
 	int _smushFrameRate;
 	bool _videoFinished;
 	bool _smushPaused;
-	
+	bool _insaneRunning;
+
 	void pauseGame();
 	void restart();
 	void shutDown();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.16
retrieving revision 2.577.2.17
diff -u -d -r2.577.2.16 -r2.577.2.17
--- scummvm.cpp	20 Jun 2004 13:23:41 -0000	2.577.2.16
+++ scummvm.cpp	26 Jun 2004 09:18:28 -0000	2.577.2.17
@@ -695,7 +695,7 @@
 
 	// Init iMuse
 	if (_features & GF_DIGI_IMUSE) {
-		_musicEngine = _imuseDigital = new IMuseDigital(this);
+		_musicEngine = _imuseDigital = new IMuseDigital(this, 10);
 		_mixer->setVolume(ConfMan.getInt("master_volume"));
 		_imuseDigital->setGroupMusicVolume(ConfMan.getInt("music_volume") / 2);
 		_imuseDigital->setGroupSfxVolume(ConfMan.getInt("sfx_volume") / 2);





More information about the Scummvm-git-logs mailing list