[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec47.cpp,1.5,1.6 player.cpp,1.24,1.25

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Dec 29 08:59:02 CET 2002


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

Modified Files:
	codec47.cpp player.cpp 
Log Message:
disabled CMI smush audio, cleanup codec 47, correct path param

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- codec47.cpp	22 Sep 2002 00:20:23 -0000	1.5
+++ codec47.cpp	29 Dec 2002 16:58:37 -0000	1.6
@@ -25,24 +25,6 @@
 #include "blitter.h"
 
 bool DumpDecoder::decode(Blitter & dst, Chunk & src) {
-	int32 i = 0;
-	/*int32 seq =*/ src.getWord();
-	int32 codec = src.getByte();
-	/*int32 flags =*/ src.getByte();
-	int32 unknown[22];
-	for(i = 0; i < 0; i++) {
-		unknown[i] = src.getByte();
-	}
-	if(codec == 5 || codec == 1) {
-		do {
-			int32 code = src.getByte();
-			int32 length = (code >> 1) + 1;
-			if (code & 1)
-				dst.put(src.getChar(), length);
-			else
-				dst.blit(src, length);
-		} while (!src.eof());
-	}
 
 	return true;
 }

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- player.cpp	25 Dec 2002 04:30:24 -0000	1.24
+++ player.cpp	29 Dec 2002 16:58:37 -0000	1.25
@@ -23,6 +23,7 @@
 #include "common/file.h"
 #include "common/util.h"
 #include "common/engine.h" // for debug, warning, error
+#include "scumm/scumm.h"
 
 #include "player.h"
 
@@ -564,7 +565,8 @@
 				handleDeltaPalette(*sub);
 				break;
 			case TYPE_IACT:
-				handleImuseAction(*sub);
+				if (g_scumm->_gameId != GID_CMI)
+					handleImuseAction(*sub);
 				break;
 			case TYPE_STOR:
 				handleStore(*sub);





More information about the Scummvm-git-logs mailing list