fix smush for compatible with dig demo

svn-id: r6043

3 files changed, 53 insertions, 6 deletions

diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index c70c9faa45..59c4fe84bf 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2444,9 +2444,12 @@ void Scumm_v6::o6_miscOps()
 				uint32 speed;
 				if (strcmp((char*)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
 	 				speed = 71;
-				else
+				else {
+					if (_insaneFlag == 0) 
+						_insaneFlag = 13;
 					speed = 1000 / _insaneFlag;
-
+				}
+				
 				debug(1, "INSANE Arg: %d", args[1]);
 
 				ScummRenderer * sr = new ScummRenderer(this, speed);
diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp
index cc796ef48e..c0e1b7c771 100644
--- a/scumm/smush/codec37.cpp
+++ b/scumm/smush/codec37.cpp
@@ -318,7 +318,7 @@ void Codec37Decoder::proc3WithoutFDFE(Blitter & dst, Chunk & src, int32 next_off
 	} while (--bh);
 }
 
-void Codec37Decoder::proc4(Blitter & dst, Chunk & src, int32 next_offs, int32 bw, int32 bh) {
+void Codec37Decoder::proc4WithFDFE(Blitter & dst, Chunk & src, int32 next_offs, int32 bw, int32 bh) {
 	do {
 		int32 i = bw;
 		do {
@@ -370,6 +370,46 @@ void Codec37Decoder::proc4(Blitter & dst, Chunk & src, int32 next_offs, int32 bw
 	} while (--bh);
 }
 
+void Codec37Decoder::proc4WithoutFDFE(Blitter & dst, Chunk & src, int32 next_offs, int32 bw, int32 bh) {
+	do {
+		int32 i = bw;
+		do {
+			int32 code = src.getByte();
+			if (code == 0xFF) {
+#ifdef USE_COLOR_CODE_FOR_BLOCK
+				dst.putBlock(expand(9));
+#else
+				dst.putBlock(src);
+#endif
+			} else if (code == 0x00) {
+				int32 length = src.getByte() + 1;
+				for (int32 l = 0; l < length; l++) {
+#ifdef USE_COLOR_CODE_FOR_BLOCK
+					dst.putBlock(expand(10));
+#else
+					dst.blockCopy(next_offs);
+#endif
+					i--;
+					if (i == 0) {
+						dst.advance(0, 3); // advance 3 lines
+						bh--;
+						i = bw;
+					}
+				}
+				if(bh == 0) return;
+				i++;
+			} else {
+#ifdef USE_COLOR_CODE_FOR_BLOCK
+				dst.putBlock(expand(11));
+#else
+				dst.blockCopy(_offsetTable[code] + next_offs); // copy from an offset !
+#endif
+			}
+		} while (--i);
+		dst.advance(0, 3); // advance 3 lines
+	} while (--bh);
+}
+
 bool Codec37Decoder::decode(Blitter & dst, Chunk & src) {
 	int32 width = getRect().width();
 	int32 height = getRect().height();
@@ -414,13 +454,16 @@ bool Codec37Decoder::decode(Blitter & dst, Chunk & src) {
 		proc2(blit, src, decoded_size);
 		break;
 	case 3:
-		if(mask_flag & 1)
+		if(mask_flag & 4)
 			proc3WithFDFE(blit, src, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable], bw, bh);
 		else
 			proc3WithoutFDFE(blit, src, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable], bw, bh);
 		break;
 	case 4:
-		proc4(blit, src, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable], bw, bh);
+		if(mask_flag & 4)
+			proc4WithFDFE(blit, src, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable], bw, bh);
+		else
+			proc4WithoutFDFE(blit, src, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable], bw, bh);
 		break;
 	default:
 #ifdef DEBUG_CODEC37
diff --git a/scumm/smush/codec37.h b/scumm/smush/codec37.h
index 548615b80e..14908d3cb0 100644
--- a/scumm/smush/codec37.h
+++ b/scumm/smush/codec37.h
@@ -78,7 +78,8 @@ protected:
 	void proc2(Blitter &, Chunk &, int32);
 	void proc3WithFDFE(Blitter &, Chunk &, int32, int32, int32);
 	void proc3WithoutFDFE(Blitter &, Chunk &, int32, int32, int32);
-	void proc4(Blitter &, Chunk &, int32, int32, int32);
+	void proc4WithFDFE(Blitter &, Chunk &, int32, int32, int32);
+	void proc4WithoutFDFE(Blitter &, Chunk &, int32, int32, int32);
 public:
 	bool decode(Blitter &, Chunk &);
 };