[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.8,1.9 sound.cpp,1.7,1.8

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Sat Sep 14 22:39:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv21952/scumm

Modified Files:
	script_v2.cpp sound.cpp 
Log Message:
speed changes to play smush movies

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- script_v2.cpp	13 Sep 2002 11:54:59 -0000	1.8
+++ script_v2.cpp	15 Sep 2002 05:38:03 -0000	1.9
@@ -2709,8 +2709,13 @@
 		case 4:
 			grabCursor(args[1], args[2], args[3], args[4]);
 			break;
-		case 6: { 
- 				ScummRenderer sr(this);
+		case 6: {
+				uint32 speed;
+				if (strcmp((char*)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
+	 				speed = 71;
+				else
+					speed = 1000 / _insaneFlag;
+				ScummRenderer sr(this, speed);
  				SmushPlayer sp(&sr);
  				char filename[512];
  				strcpy(filename, _gameDataPath);
@@ -2718,6 +2723,7 @@
  				strcat(filename, (char*)getStringAddressVar(VAR_VIDEONAME));
  				sp.play(filename);
  			}
+			break;
 		case 7:
 			warning("o6_miscOps: stub7()");
 			break;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sound.cpp	13 Sep 2002 12:20:55 -0000	1.7
+++ sound.cpp	15 Sep 2002 05:38:03 -0000	1.8
@@ -105,7 +105,7 @@
 #endif
 			
 			if ((_scumm->_gameId == GID_DIG) && (data[0] == 4096)){
-					playBundleMusic(data[1] - 1);
+//					playBundleMusic(data[1] - 1);
 			}
 
 			if (!(_scumm->_features & GF_AFTER_V7)) {





More information about the Scummvm-git-logs mailing list