From c9b054462532325548d02ee01e147d2b3e991b40 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Mon, 18 Aug 2003 15:13:15 +0000
Subject: some changes for smush codec 1 and 3, handled by bomp decompression

svn-id: r9766
---
 scumm/smush/smush_player.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'scumm/smush')

diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 214c8d9812..44b9a46f3d 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -712,8 +712,8 @@ void SmushPlayer::handleFrameObject(Chunk &b) {
 
 	switch (codec) {
 	case 1:
+		bompDecodeLine(_dst, chunk_buffer, chunk_size);
 	case 3:
-#if 1
 		// 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
@@ -722,11 +722,7 @@ void SmushPlayer::handleFrameObject(Chunk &b) {
 		// 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).
-		decompressBomp(_dst, chunk_buffer, _width, _height);
-#else
-		extern void smush_decode_codec1(byte *dst, byte *src, int height);
-		smush_decode_codec1(_dst, chunk_buffer, _height);
-#endif
+		bompDecodeLineReverse(_dst, chunk_buffer, chunk_size);
 		break;
 	case 37:
 		_codec37.decode(_dst, chunk_buffer);
-- 
cgit v1.2.3