[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.60,1.61

[Pawel Kolodziejski]

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

Modified Files:
	smush_player.cpp 
Log Message:
codec1 is not bomp codec

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- smush_player.cpp	16 Nov 2003 20:52:57 -0000	1.60
+++ smush_player.cpp	16 Nov 2003 21:53:22 -0000	1.61
@@ -685,6 +685,8 @@
 	setPalette(_pal);
 }
 
+void smush_decode_codec1(byte *dst, byte *src, int height);
+
 void SmushPlayer::handleFrameObject(Chunk &b) {
 	checkBlock(b, TYPE_FOBJ, 14);
 	if (_skipNext) {
@@ -720,17 +722,8 @@
 
 	switch (codec) {
 	case 1:
-		bompDecodeLine(_dst, chunk_buffer, chunk_size);
 	case 3:
-		// FIXME: I am not 100% sure if this is correct. I tried to test this,
-		// but the only place I found codec 1 being used was in FT.
-		// But either is the codec only used to encode all-black frames, or
-		// smush_decode_codec1 already produced invalid (all-black?) output.
-		//
-		// BTW regarding codec 3: I haven't yet actually seen it being used,
-		// but is it really identical to codec 1? Or isn't it maybe a
-		// 'reverse' version (see also bompDecodeLineReverse).
-		bompDecodeLineReverse(_dst, chunk_buffer, chunk_size);
+		smush_decode_codec1(_dst, chunk_buffer, _height);
 		break;
 	case 37:
 		_codec37.decode(_dst, chunk_buffer);