moved bomp stuff into own files; removed some of our 6 (!) bomp decoders

svn-id: r8151

11 files changed, 551 insertions, 539 deletions

diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 5f3b436ef4..99878607c2 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -24,6 +24,7 @@
 #include "scumm.h"
 #include "actor.h"
 #include "akos.h"
+#include "bomp.h"
 #include "imuse.h"
 #include "sound.h"
 
@@ -919,7 +920,7 @@ void AkosRenderer::akos16Decompress(byte *dest, int32 pitch, const byte *src, in
 	assert(t_width > 0);
 	while (t_height--) {
 		akos16DecodeLine(tmp_buf, t_width, dir);
-		_vm->bompApplyShadow(_shadow_mode, akos16.buffer, dest, t_width, transparency);
+		bompApplyShadow(_shadow_mode, _shadow_table, akos16.buffer, dest, t_width, transparency);
 
 		if (numskip_after != 0)	{
 			akos16SkipData(numskip_after);
@@ -950,7 +951,7 @@ void AkosRenderer::akos16DecompressMask(byte *dest, int32 pitch, const byte *src
 	while (t_height--) {
 		akos16DecodeLine(tmp_buf, t_width, dir);
 		akos16ApplyMask(akos16.buffer, maskptr, (byte)bitpos_start, t_width, transparency);
-		_vm->bompApplyShadow(_shadow_mode, akos16.buffer, dest, t_width, transparency);
+		bompApplyShadow(_shadow_mode, _shadow_table, akos16.buffer, dest, t_width, transparency);
 
 		if (numskip_after != 0)	{
 			akos16SkipData(numskip_after);
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp
new file mode 100644
index 0000000000..acd664783c
--- /dev/null
+++ b/scumm/bomp.cpp
@@ -0,0 +1,506 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ * Copyright (C) 2001-2003 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+#include "stdafx.h"
+#include "scumm.h"
+#include "bomp.h"
+
+
+static void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size);
+
+static void bompDecodeLineReverse(byte *dst, const byte *src, int size);
+
+static void bompApplyMask(byte *line_buffer, byte *mask_out, byte bits, int32 size);
+static void bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency);
+static void bompApplyShadow1(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
+static void bompApplyShadow3(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
+static void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size);
+
+
+
+void decompressBomp(byte *dst, const byte *src, int w, int h) {
+	assert(w > 0);
+	assert(h > 0);
+
+	do {
+#if 0
+		bompDecodeLine(dst, src + 2, w);
+		src += READ_LE_UINT16(src) + 2;
+#else
+		int len, num;
+		byte code, color;
+	
+		len = w;
+		src += 2;
+		while (len) {
+			code = *src++;
+			num = (code >> 1) + 1;
+			if (num > len)
+				num = len;
+			len -= num;
+			if (code & 1) {
+				color = *src++;
+				memset(dst, color, num);
+			} else {
+				memcpy(dst, src, num);
+				src += num;
+			}
+			dst += num;
+		}
+#endif
+	} while (--h);
+}
+
+void bompDecodeLine(byte *dst, const byte *src, int size) {
+	assert(size > 0);
+
+	int len, num;
+	byte code, color;
+
+	len = size;
+	while (len) {
+		code = *src++;
+		num = (code >> 1) + 1;
+		if (num > len)
+			num = len;
+		len -= num;
+		if (code & 1) {
+			color = *src++;
+			memset(dst, color, num);
+		} else {
+			memcpy(dst, src, num);
+			src += num;
+		}
+		dst += num;
+	}
+}
+
+void bompDecodeLineReverse(byte *dst, const byte *src, int size) {
+	assert(size > 0);
+
+	dst += size;
+	
+	int len, num;
+	byte code, color;
+
+	len = size;
+	while (len) {
+		code = *src++;
+		num = (code >> 1) + 1;
+		if (num > len)
+			num = len;
+		len -= num;
+		dst -= num;
+		if (code & 1) {
+			color = *src++;
+			memset(dst, color, num);
+		} else {
+			memcpy(dst, src, num);
+			src += num;
+		}
+	}
+}
+
+void bompApplyMask(byte *line_buffer, byte *mask_src, byte bits, int32 size) {
+	while(1) {
+		byte tmp = *(mask_src++);
+		do {
+			if (size-- == 0) 
+				return;
+			if (tmp & bits) {
+				*(line_buffer) = 255;
+			}
+			line_buffer++;
+			bits >>= 1;
+		} while	(bits);
+		bits = 128;
+	}
+}
+
+void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency) {
+	assert(size > 0);
+	switch(shadowMode) {
+	case 0:
+		bompApplyShadow0(line_buffer, dst, size, transparency);
+		break;
+	case 1:
+		bompApplyShadow1(shadowPalette, line_buffer, dst, size, transparency);
+		break;
+	case 3:
+		bompApplyShadow3(shadowPalette, line_buffer, dst, size, transparency);
+		break;
+	default:
+		error("Unknown shadow mode %d", shadowMode);
+	}
+}
+void bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency) {
+	while(size-- > 0) {
+		byte tmp = *line_buffer++;
+		if (tmp != transparency) {
+			*dst = tmp;
+		}
+		dst++;
+	}
+}
+
+void bompApplyShadow1(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency) {
+	while(size-- > 0) {
+		byte tmp = *line_buffer++;
+		if (tmp != transparency) {
+			if (tmp == 13) {
+				tmp = shadowPalette[*(dst)];
+			}
+			*dst = tmp;
+		}
+		dst++;
+	}
+}
+
+void bompApplyShadow3(const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency) {
+	while(size-- > 0) {
+		byte tmp = *line_buffer++;
+		if (tmp != transparency) {
+			if (tmp < 8) {
+				tmp = shadowPalette[*dst + (tmp << 8)];
+			}
+			*dst = tmp;
+		}
+		dst++;
+	}
+}
+
+void bompApplyActorPalette(byte *actorPalette, byte *line_buffer, int32 size) {
+	if (actorPalette != 0) {
+		actorPalette[255] = 255;
+		while(1) {
+			if (size-- == 0)
+				break;
+			*line_buffer = actorPalette[*line_buffer];
+			line_buffer++;
+		}
+	}
+}
+
+void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size) {
+	byte * line_ptr1 = line_buffer;
+	byte * line_ptr2 = line_buffer;
+
+	byte tmp = *(scaling_x_ptr++);
+
+	while (size--) {
+		if ((skip & tmp) == 0) {
+			*(line_ptr1++) = *(line_ptr2);
+		}
+		line_ptr2++;
+		skip >>= 1;
+		if (skip == 0) {
+			skip = 128;
+			tmp = *(scaling_x_ptr++);
+		}
+	}
+}
+
+void Scumm::drawBomp(const BompDrawData &bd, int decode_mode, int mask) {
+	byte skip_y = 128;
+	byte skip_y_new = 0;
+	byte bits;
+	byte *mask_out = 0;
+	byte *charset_mask;
+	byte tmp;
+	int32 clip_left, clip_right, clip_top, clip_bottom, tmp_x, tmp_y, mask_offset, mask_pitch;
+	byte *scalingYPtr = bd.scalingYPtr;
+
+	if (bd.x < 0) {
+		clip_left = -bd.x;
+	} else {
+		clip_left = 0;
+	}
+
+	if (bd.y < 0) {
+		clip_top = -bd.y;
+	} else {
+		clip_top = 0;
+	}
+
+	clip_right = bd.srcwidth - clip_left;
+	tmp_x = bd.x + bd.srcwidth;
+	if (tmp_x > bd.outwidth) {
+		clip_right -= tmp_x - bd.outwidth;
+	}
+
+	clip_bottom = bd.srcheight;
+	tmp_y = bd.y + bd.srcheight;
+	if (tmp_y > bd.outheight) {
+		clip_bottom -= tmp_y - bd.outheight;
+	}
+
+	const byte *src = bd.dataptr;
+	byte *dst = bd.out + bd.y * bd.outwidth + bd.x + clip_left;
+
+	mask_pitch = _screenWidth / 8;
+	mask_offset = _screenStartStrip + (bd.y * mask_pitch) + ((bd.x + clip_left) >> 3);
+
+	charset_mask = getResourceAddress(rtBuffer, 9) + mask_offset;
+	bits = 128 >> ((bd.x + clip_left) & 7);
+
+	if (mask == 1) {
+		mask_out = bd.maskPtr + mask_offset;
+	}
+
+	if (mask == 3) {
+		if (scalingYPtr != NULL) {
+			skip_y_new = *(scalingYPtr++);
+		}
+
+		if ((clip_right + clip_left) > bd.scaleRight) {
+			clip_right = bd.scaleRight - clip_left;
+		}
+
+		if (clip_bottom > bd.scaleBottom) {
+			clip_bottom = bd.scaleBottom;
+		}
+	}
+
+	if ((clip_right <= 0) || (clip_bottom <= 0))
+		return;
+
+	int32 pos_y = 0;
+
+	byte line_buffer[1024];
+
+	byte *line_ptr = line_buffer + clip_left;
+
+	while(1) {
+		switch(decode_mode) {
+		case 0:
+			memcpy(line_buffer, src, bd.srcwidth);
+			src += bd.srcwidth;
+			break;
+		case 1:
+			bompDecodeLine(line_buffer, src + 2, bd.srcwidth);
+			src += READ_LE_UINT16(src) + 2;
+			break;
+		case 3:
+			bompDecodeLineReverse(line_buffer, src + 2, bd.srcwidth);
+			src += READ_LE_UINT16(src) + 2;
+			break;
+		default:
+			error("Unknown bomp decode_mode %d", decode_mode);
+		}
+
+		if (mask == 3) {
+			if (bd.scale_y != 255) {
+				tmp = skip_y_new & skip_y;
+				skip_y >>= 1;
+				if (skip_y == 0) {
+					skip_y = 128;
+					skip_y_new = *(scalingYPtr++);
+				}
+
+				if (tmp != 0) 
+					continue;
+			}
+
+			if (bd.scale_x != 255) {
+				bompScaleFuncX(line_buffer, bd.scalingXPtr, 128, bd.srcwidth);
+			}
+		}
+
+		if (clip_top > 0) {
+			clip_top--;
+		} else {
+
+			if (mask == 1) {
+				bompApplyMask(line_ptr, mask_out, bits, clip_right);
+			}
+	
+			bompApplyMask(line_ptr, charset_mask, bits, clip_right);
+			bompApplyActorPalette(_bompActorPalettePtr, line_ptr, clip_right);
+			bompApplyShadow(bd.shadowMode, _shadowPalette, line_ptr, dst, clip_right, 255);
+		}
+
+		mask_out += mask_pitch;
+		charset_mask += mask_pitch;
+		pos_y++;
+		dst += bd.outwidth;
+		if (pos_y >= clip_bottom)
+			break;
+	}
+}
+
+
+static byte _bompScaleTable[] = {
+    0, 128,  64, 192,  32, 160,  96, 224,
+   16, 144,  80, 208,  48, 176, 112, 240,
+    8, 136,  72, 200,  40, 168, 104, 232,
+   24, 152,  88, 216,  56, 184, 120, 248,
+    4, 132,  68, 196,  36, 164, 100, 228,
+   20, 148,  84, 212,  52, 180, 116, 244,
+   12, 140,  76, 204,  44, 172, 108, 236,
+   28, 156,  92, 220,  60, 188, 124, 252,
+    2, 130,  66, 194,  34, 162,  98, 226,
+   18, 146,  82, 210,  50, 178, 114, 242,
+   10, 138,  74, 202,  42, 170, 106, 234,
+   26, 154,  90, 218,  58, 186, 122, 250,
+    6, 134,  70, 198,  38, 166, 102, 230,
+   22, 150,  86, 214,  54, 182, 118, 246,
+   14, 142,  78, 206,  46, 174, 110, 238,
+   30, 158,  94, 222,  62, 190, 126, 254,
+    1, 129,  65, 193,  33, 161,  97, 225,
+   17, 145,  81, 209,  49, 177, 113, 241,
+    9, 137,  73, 201,  41, 169, 105, 233,
+   25, 153,  89, 217,  57, 185, 121, 249,
+    5, 133,  69, 197,  37, 165, 101, 229,
+   21, 149,  85, 213,  53, 181, 117, 245,
+   13, 141,  77, 205,  45, 173, 109, 237,
+   29, 157,  93, 221,  61, 189, 125, 253,
+    3, 131,  67, 195,  35, 163,  99, 227,
+   19, 147,  83, 211,  51, 179, 115, 243,
+   11, 139,  75, 203,  43, 171, 107, 235,
+   27, 155,  91, 219,  59, 187, 123, 251,
+    7, 135,  71, 199,  39, 167, 103, 231,
+   23, 151,  87, 215,  55, 183, 119, 247,
+   15, 143,  79, 207,  47, 175, 111, 239,
+   31, 159,  95, 223,  63, 191, 127, 255,
+
+    0, 128,  64, 192,  32, 160,  96, 224,
+   16, 144,  80, 208,  48, 176, 112, 240,
+    8, 136,  72, 200,  40, 168, 104, 232,
+   24, 152,  88, 216,  56, 184, 120, 248,
+    4, 132,  68, 196,  36, 164, 100, 228,
+   20, 148,  84, 212,  52, 180, 116, 244,
+   12, 140,  76, 204,  44, 172, 108, 236,
+   28, 156,  92, 220,  60, 188, 124, 252,
+    2, 130,  66, 194,  34, 162,  98, 226,
+   18, 146,  82, 210,  50, 178, 114, 242,
+   10, 138,  74, 202,  42, 170, 106, 234,
+   26, 154,  90, 218,  58, 186, 122, 250,
+    6, 134,  70, 198,  38, 166, 102, 230,
+   22, 150,  86, 214,  54, 182, 118, 246,
+   14, 142,  78, 206,  46, 174, 110, 238,
+   30, 158,  94, 222,  62, 190, 126, 254,
+    1, 129,  65, 193,  33, 161,  97, 225,
+   17, 145,  81, 209,  49, 177, 113, 241,
+    9, 137,  73, 201,  41, 169, 105, 233,
+   25, 153,  89, 217,  57, 185, 121, 249,
+    5, 133,  69, 197,  37, 165, 101, 229,
+   21, 149,  85, 213,  53, 181, 117, 245,
+   13, 141,  77, 205,  45, 173, 109, 237,
+   29, 157,  93, 221,  61, 189, 125, 253,
+    3, 131,  67, 195,  35, 163,  99, 227,
+   19, 147,  83, 211,  51, 179, 115, 243,
+   11, 139,  75, 203,  43, 171, 107, 235,
+   27, 155,  91, 219,  59, 187, 123, 251,
+    7, 135,  71, 199,  39, 167, 103, 231,
+   23, 151,  87, 215,  55, 183, 119, 247,
+   15, 143,  79, 207,  47, 175, 111, 239,
+   31, 159,  95, 223,  63, 191, 127, 255,
+};
+
+static byte _bompBitsTable[] = {
+	8, 7, 7, 6, 7, 6, 6, 5, 7, 6, 6, 5, 6, 5, 5, 4,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
+	4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0,
+};
+
+int32 setupBompScale(byte * scaling, int32 size, byte scale) {
+	uint32 tmp = (256 - (size >> 1));
+	int32 count = (size + 7) >> 3;
+	assert(tmp < sizeof(_bompScaleTable));
+	byte * tmp_ptr = _bompScaleTable + tmp;
+	byte * tmp_scaling = scaling;
+	byte a = 0;
+
+	while((count--) != 0) {
+		tmp = *(tmp_ptr + 3);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp = *(tmp_ptr + 2);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp = *(tmp_ptr + 1);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp = *(tmp_ptr + 0);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp_ptr += 4;
+
+		tmp = *(tmp_ptr + 3);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp = *(tmp_ptr + 2);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp = *(tmp_ptr + 1);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp = *(tmp_ptr + 0);
+		a <<= 1;
+		if (scale < tmp) {
+			a |= 1;
+		}
+		tmp_ptr += 4;
+
+		*(tmp_scaling++) = a;
+	}
+	if ((size & 7) != 0) {
+		*(tmp_scaling - 1) |= revBitMask[size & 7];
+	}
+
+	count = (size + 7) >> 3;
+	byte ret_value = 0;
+	while(count--) {
+		tmp = *scaling++;
+		assert(tmp < sizeof(_bompBitsTable));
+		ret_value += _bompBitsTable[tmp];
+	}
+
+	return ret_value;
+}
+
diff --git a/scumm/bomp.h b/scumm/bomp.h
new file mode 100644
index 0000000000..a761248f10
--- /dev/null
+++ b/scumm/bomp.h
@@ -0,0 +1,34 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ * Copyright (C) 2001-2003 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+#ifndef BOMP_H
+#define BOMP_H
+
+int32 setupBompScale(byte *scaling, int32 size, byte scale);
+
+void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency);
+
+
+void decompressBomp(byte *dst, const byte *src, int w, int h);
+void bompDecodeLine(byte *dst, const byte *src, int size);
+
+
+#endif
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 921587609e..7481cbf30a 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
+#include "bomp.h"
 #include "charset.h"
 #include "resource.h"
 #include "usage_bits.h"
@@ -3243,324 +3244,6 @@ void Scumm::makeCursorColorTransparent(int a) {
 	updateCursor();
 }
 
-#pragma mark -
-#pragma mark --- Bomp ---
-#pragma mark -
-
-int32 Scumm::bompDecodeLineMode0(const byte *src, byte *line_buffer, int32 size) {
-	if (size <= 0)
-		return size;
-
-	memcpy(line_buffer, src, size);
-	return size;
-}
-
-int32 Scumm::bompDecodeLineMode1(const byte *src, byte *line_buffer, int32 size) {
-	int32 t_size = READ_LE_UINT16(src) + 2;
-	if (size <= 0)
-		return t_size;
-	
-	int len, num;
-	byte code, color;
-
-	len = size;
-	src += 2;
-	while (len) {
-		code = *src++;
-		num = (code >> 1) + 1;
-		if (num > len)
-			num = len;
-		len -= num;
-		if (code & 1) {
-			color = *src++;
-			memset(line_buffer, color, num);
-		} else {
-			memcpy(line_buffer, src, num);
-			src += num;
-		}
-		line_buffer += num;
-	}
-	return t_size;
-}
-
-int32 Scumm::bompDecodeLineMode3(const byte *src, byte *line_buffer, int32 size) {
-	int32 t_size = READ_LE_UINT16(src) + 2;
-	line_buffer += size;
-	if (size <= 0)
-		return t_size;
-	
-	int len, num;
-	byte code, color;
-
-	len = size;
-	src += 2;
-	while (len) {
-		code = *src++;
-		num = (code >> 1) + 1;
-		if (num > len)
-			num = len;
-		len -= num;
-		line_buffer -= num;
-		if (code & 1) {
-			color = *src++;
-			memset(line_buffer, color, num);
-		} else {
-			memcpy(line_buffer, src, num);
-			src += num;
-		}
-	}
-	return t_size;
-}
-
-void Scumm::bompApplyMask(byte *line_buffer, byte *mask_src, byte bits, int32 size) {
-	while(1) {
-		byte tmp = *(mask_src++);
-		do {
-			if (size-- == 0) 
-				return;
-			if (tmp & bits) {
-				*(line_buffer) = 255;
-			}
-			line_buffer++;
-			bits >>= 1;
-		} while	(bits);
-		bits = 128;
-	}
-}
-
-void Scumm::bompApplyShadow(int shadowMode, const byte *line_buffer, byte *dst, int32 size, byte transparency) const {
-	assert(size > 0);
-	switch(shadowMode) {
-	case 0:
-		bompApplyShadow0(line_buffer, dst, size, transparency);
-		break;
-	case 1:
-		bompApplyShadow1(line_buffer, dst, size, transparency);
-		break;
-	case 3:
-		bompApplyShadow3(line_buffer, dst, size, transparency);
-		break;
-	default:
-		error("Unknown shadow mode %d", shadowMode);
-	}
-}
-void Scumm::bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency) const {
-	while(size-- > 0) {
-		byte tmp = *line_buffer++;
-		if (tmp != transparency) {
-			*dst = tmp;
-		}
-		dst++;
-	}
-}
-
-void Scumm::bompApplyShadow1(const byte *line_buffer, byte *dst, int32 size, byte transparency) const {
-	while(size-- > 0) {
-		byte tmp = *line_buffer++;
-		if (tmp != transparency) {
-			if (tmp == 13) {
-				tmp = _shadowPalette[*(dst)];
-			}
-			*dst = tmp;
-		}
-		dst++;
-	}
-}
-
-void Scumm::bompApplyShadow3(const byte *line_buffer, byte *dst, int32 size, byte transparency) const {
-	while(size-- > 0) {
-		byte tmp = *line_buffer++;
-		if (tmp != transparency) {
-			if (tmp < 8) {
-				tmp = _shadowPalette[*dst + (tmp << 8)];
-			}
-			*dst = tmp;
-		}
-		dst++;
-	}
-}
-
-void Scumm::bompApplyActorPalette(byte *line_buffer, int32 size) const {
-	if (_bompActorPalettePtr != 0) {
-		*(_bompActorPalettePtr + 255) = 255;
-		while(1) {
-			if (size-- == 0)
-				break;
-			*line_buffer = *(_bompActorPalettePtr + *line_buffer);
-			line_buffer++;
-		}
-	}
-}
-
-void Scumm::bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size) {
-	byte * line_ptr1 = line_buffer;
-	byte * line_ptr2 = line_buffer;
-
-	byte tmp = *(scaling_x_ptr++);
-
-	while (size--) {
-		if ((skip & tmp) == 0) {
-			*(line_ptr1++) = *(line_ptr2);
-		}
-		line_ptr2++;
-		skip >>= 1;
-		if (skip == 0) {
-			skip = 128;
-			tmp = *(scaling_x_ptr++);
-		}
-	}
-}
-
-void Scumm::decompressBomp(byte *dst, const byte *src, int w, int h) {
-	int len, num;
-	byte code, color;
-
-	do {
-		len = w;
-		src += 2;
-		while (len) {
-			code = *src++;
-			num = (code >> 1) + 1;
-			if (num > len)
-				num = len;
-			len -= num;
-			if (code & 1) {
-				color = *src++;
-				memset(dst, color, num);
-			} else {
-				memcpy(dst, src, num);
-				src += num;
-			}
-			dst += num;
-		}
-	} while (--h);
-}
-
-void Scumm::drawBomp(const BompDrawData &bd, int decode_mode, int mask) {
-	byte skip_y = 128;
-	byte skip_y_new = 0;
-	byte bits;
-	byte *mask_out = 0;
-	byte *charset_mask;
-	byte tmp;
-	int32 clip_left, clip_right, clip_top, clip_bottom, tmp_x, tmp_y, mask_offset, mask_pitch;
-	byte *scalingYPtr = bd.scalingYPtr;
-
-	if (bd.x < 0) {
-		clip_left = -bd.x;
-	} else {
-		clip_left = 0;
-	}
-
-	if (bd.y < 0) {
-		clip_top = -bd.y;
-	} else {
-		clip_top = 0;
-	}
-
-	clip_right = bd.srcwidth - clip_left;
-	tmp_x = bd.x + bd.srcwidth;
-	if (tmp_x > bd.outwidth) {
-		clip_right -= tmp_x - bd.outwidth;
-	}
-
-	clip_bottom = bd.srcheight;
-	tmp_y = bd.y + bd.srcheight;
-	if (tmp_y > bd.outheight) {
-		clip_bottom -= tmp_y - bd.outheight;
-	}
-
-	const byte *src = bd.dataptr;
-	byte *dst = bd.out + bd.y * bd.outwidth + bd.x + clip_left;
-
-	mask_pitch = _screenWidth / 8;
-	mask_offset = _screenStartStrip + (bd.y * mask_pitch) + ((bd.x + clip_left) >> 3);
-
-	charset_mask = getResourceAddress(rtBuffer, 9) + mask_offset;
-	bits = 128 >> ((bd.x + clip_left) & 7);
-
-	if (mask == 1) {
-		mask_out = bd.maskPtr + mask_offset;
-	}
-
-	if (mask == 3) {
-		if (scalingYPtr != NULL) {
-			skip_y_new = *(scalingYPtr++);
-		}
-
-		if ((clip_right + clip_left) > bd.scaleRight) {
-			clip_right = bd.scaleRight - clip_left;
-		}
-
-		if (clip_bottom > bd.scaleBottom) {
-			clip_bottom = bd.scaleBottom;
-		}
-	}
-
-	if ((clip_right <= 0) || (clip_bottom <= 0))
-		return;
-
-	int32 pos_y = 0;
-
-	byte line_buffer[1024];
-
-	byte *line_ptr = line_buffer + clip_left;
-
-	while(1) {
-		switch(decode_mode) {
-		case 0:
-			src += bompDecodeLineMode0(src, line_buffer, bd.srcwidth);
-			break;
-		case 1:
-			src += bompDecodeLineMode1(src, line_buffer, bd.srcwidth);
-			break;
-		case 3:
-			src += bompDecodeLineMode3(src, line_buffer, bd.srcwidth);
-			break;
-		default:
-			error("Unknown bomp decode_mode %d", decode_mode);
-		}
-
-		if (mask == 3) {
-			if (bd.scale_y != 255) {
-				tmp = skip_y_new & skip_y;
-				skip_y >>= 1;
-				if (skip_y == 0) {
-					skip_y = 128;
-					skip_y_new = *(scalingYPtr++);
-				}
-
-				if (tmp != 0) 
-					continue;
-			}
-
-			if (bd.scale_x != 255) {
-				bompScaleFuncX(line_buffer, bd.scalingXPtr, 128, bd.srcwidth);
-			}
-		}
-
-		if (clip_top > 0) {
-			clip_top--;
-		} else {
-
-			if (mask == 1) {
-				bompApplyMask(line_ptr, mask_out, bits, clip_right);
-			}
-	
-			bompApplyMask(line_ptr, charset_mask, bits, clip_right);
-			bompApplyActorPalette(line_ptr, clip_right);
-			bompApplyShadow(bd.shadowMode, line_ptr, dst, clip_right, 255);
-		}
-
-		mask_out += mask_pitch;
-		charset_mask += mask_pitch;
-		pos_y++;
-		dst += bd.outwidth;
-		if (pos_y >= clip_bottom)
-			break;
-	}
-}
-
 
 #ifdef __PALM_OS__
 #include "scumm_globals.h" // init globals
diff --git a/scumm/module.mk b/scumm/module.mk
index eb616d2bd3..1f58f63422 100644
--- a/scumm/module.mk
+++ b/scumm/module.mk
@@ -4,6 +4,7 @@ SCUMM_OBJS = \
 	scumm/actor.o \
 	scumm/akos.o \
 	scumm/base-costume.o \
+	scumm/bomp.o \
 	scumm/boxes.o \
 	scumm/bundle.o \
 	scumm/camera.o \
diff --git a/scumm/object.cpp b/scumm/object.cpp
index aa4eca86a9..f8bed2e29e 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
+#include "bomp.h"
 #include "object.h"
 #include "resource.h"
 #include "usage_bits.h"
@@ -1557,163 +1558,6 @@ void Scumm::drawBlastObject(BlastObject *eo) {
 	updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y, bdd.y + bdd.srcheight, 0);
 }
 
-static byte _bompScaleTable[] = {
-    0, 128,  64, 192,  32, 160,  96, 224,
-   16, 144,  80, 208,  48, 176, 112, 240,
-    8, 136,  72, 200,  40, 168, 104, 232,
-   24, 152,  88, 216,  56, 184, 120, 248,
-    4, 132,  68, 196,  36, 164, 100, 228,
-   20, 148,  84, 212,  52, 180, 116, 244,
-   12, 140,  76, 204,  44, 172, 108, 236,
-   28, 156,  92, 220,  60, 188, 124, 252,
-    2, 130,  66, 194,  34, 162,  98, 226,
-   18, 146,  82, 210,  50, 178, 114, 242,
-   10, 138,  74, 202,  42, 170, 106, 234,
-   26, 154,  90, 218,  58, 186, 122, 250,
-    6, 134,  70, 198,  38, 166, 102, 230,
-   22, 150,  86, 214,  54, 182, 118, 246,
-   14, 142,  78, 206,  46, 174, 110, 238,
-   30, 158,  94, 222,  62, 190, 126, 254,
-    1, 129,  65, 193,  33, 161,  97, 225,
-   17, 145,  81, 209,  49, 177, 113, 241,
-    9, 137,  73, 201,  41, 169, 105, 233,
-   25, 153,  89, 217,  57, 185, 121, 249,
-    5, 133,  69, 197,  37, 165, 101, 229,
-   21, 149,  85, 213,  53, 181, 117, 245,
-   13, 141,  77, 205,  45, 173, 109, 237,
-   29, 157,  93, 221,  61, 189, 125, 253,
-    3, 131,  67, 195,  35, 163,  99, 227,
-   19, 147,  83, 211,  51, 179, 115, 243,
-   11, 139,  75, 203,  43, 171, 107, 235,
-   27, 155,  91, 219,  59, 187, 123, 251,
-    7, 135,  71, 199,  39, 167, 103, 231,
-   23, 151,  87, 215,  55, 183, 119, 247,
-   15, 143,  79, 207,  47, 175, 111, 239,
-   31, 159,  95, 223,  63, 191, 127, 255,
-
-    0, 128,  64, 192,  32, 160,  96, 224,
-   16, 144,  80, 208,  48, 176, 112, 240,
-    8, 136,  72, 200,  40, 168, 104, 232,
-   24, 152,  88, 216,  56, 184, 120, 248,
-    4, 132,  68, 196,  36, 164, 100, 228,
-   20, 148,  84, 212,  52, 180, 116, 244,
-   12, 140,  76, 204,  44, 172, 108, 236,
-   28, 156,  92, 220,  60, 188, 124, 252,
-    2, 130,  66, 194,  34, 162,  98, 226,
-   18, 146,  82, 210,  50, 178, 114, 242,
-   10, 138,  74, 202,  42, 170, 106, 234,
-   26, 154,  90, 218,  58, 186, 122, 250,
-    6, 134,  70, 198,  38, 166, 102, 230,
-   22, 150,  86, 214,  54, 182, 118, 246,
-   14, 142,  78, 206,  46, 174, 110, 238,
-   30, 158,  94, 222,  62, 190, 126, 254,
-    1, 129,  65, 193,  33, 161,  97, 225,
-   17, 145,  81, 209,  49, 177, 113, 241,
-    9, 137,  73, 201,  41, 169, 105, 233,
-   25, 153,  89, 217,  57, 185, 121, 249,
-    5, 133,  69, 197,  37, 165, 101, 229,
-   21, 149,  85, 213,  53, 181, 117, 245,
-   13, 141,  77, 205,  45, 173, 109, 237,
-   29, 157,  93, 221,  61, 189, 125, 253,
-    3, 131,  67, 195,  35, 163,  99, 227,
-   19, 147,  83, 211,  51, 179, 115, 243,
-   11, 139,  75, 203,  43, 171, 107, 235,
-   27, 155,  91, 219,  59, 187, 123, 251,
-    7, 135,  71, 199,  39, 167, 103, 231,
-   23, 151,  87, 215,  55, 183, 119, 247,
-   15, 143,  79, 207,  47, 175, 111, 239,
-   31, 159,  95, 223,  63, 191, 127, 255,
-};
-
-static byte _bompBitsTable[] = {
-	8, 7, 7, 6, 7, 6, 6, 5, 7, 6, 6, 5, 6, 5, 5, 4,
-	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
-	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-	6, 5, 5, 4, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 3, 2,
-	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-	5, 4, 4, 3, 4, 3, 3, 2, 4, 3, 3, 2, 3, 2, 2, 1,
-	4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0,
-};
-
-int32 Scumm::setupBompScale(byte * scaling, int32 size, byte scale) {
-	uint32 tmp = (256 - (size >> 1));
-	int32 count = (size + 7) >> 3;
-	assert(tmp < sizeof(_bompScaleTable));
-	byte * tmp_ptr = _bompScaleTable + tmp;
-	byte * tmp_scaling = scaling;
-	byte a = 0;
-
-	while((count--) != 0) {
-		tmp = *(tmp_ptr + 3);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp = *(tmp_ptr + 2);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp = *(tmp_ptr + 1);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp = *(tmp_ptr + 0);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp_ptr += 4;
-
-		tmp = *(tmp_ptr + 3);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp = *(tmp_ptr + 2);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp = *(tmp_ptr + 1);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp = *(tmp_ptr + 0);
-		a <<= 1;
-		if (scale < tmp) {
-			a |= 1;
-		}
-		tmp_ptr += 4;
-
-		*(tmp_scaling++) = a;
-	}
-	if ((size & 7) != 0) {
-		*(tmp_scaling - 1) |= revBitMask[size & 7];
-	}
-
-	count = (size + 7) >> 3;
-	byte ret_value = 0;
-	while(count--) {
-		tmp = *scaling++;
-		assert(tmp < sizeof(_bompBitsTable));
-		ret_value += _bompBitsTable[tmp];
-	}
-
-	return ret_value;
-}
-
 void Scumm::removeBlastObjects() {
 	BlastObject *eo;
 	int i;
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 62da645d4e..999a69e497 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -899,24 +899,9 @@ protected:
 	// bomp
 public:
 	byte *_bompActorPalettePtr;
-
 	void drawBomp(const BompDrawData &bd, int decode_mode, int mask);
-protected:
-	static void decompressBomp(byte *dst, const byte *src, int w, int h);
-	static int32 setupBompScale(byte *scaling, int32 size, byte scale);
-	static void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size);
-	static int32 bompDecodeLineMode0(const byte *src, byte *line_buffer, int32 size);
-	static int32 bompDecodeLineMode1(const byte *src, byte *line_buffer, int32 size);
-	static int32 bompDecodeLineMode3(const byte *src, byte *line_buffer, int32 size);
-	static void bompApplyMask(byte *line_buffer, byte *mask_out, byte bits, int32 size);
-public:
-	void bompApplyShadow(int shadowMode, const byte *line_buffer, byte *dst, int32 size, byte transparency) const;
-protected:
-	void bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency) const;
-	void bompApplyShadow1(const byte *line_buffer, byte *dst, int32 size, byte transparency) const;
-	void bompApplyShadow3(const byte *line_buffer, byte *dst, int32 size, byte transparency) const;
-	void bompApplyActorPalette(byte *line_buffer, int32 size) const;
 
+protected:
 	bool _shakeEnabled;
 	uint _shakeFrame;
 	void setShake(int mode);
diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp
index ec0fde5289..8ae00fa957 100644
--- a/scumm/smush/codec37.cpp
+++ b/scumm/smush/codec37.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "codec37.h"
+#include "scumm/bomp.h"
 
 #include "common/engine.h"
 
@@ -246,27 +247,6 @@ void Codec37Decoder::maketable(int pitch, int index) {
 	}
 }
 
-void Codec37Decoder::bompDecode(byte *dst, const byte *src, int len) {
-	byte code;
-	byte color;
-	int32 num;
-
-	do {
-		code = *src++;
-		num = (code >> 1) + 1;
-		if (code & 1) {
-			color = *src++;
-			memset(dst, color, num);
-		} else {
-			memcpy(dst, src, num);
-			src += num;
-		}
-		dst += num;
-		len -= num;
-	} while (len > 0);
-	assert(len == 0);
-}
-
 #if defined(SCUMM_NEED_ALIGNMENT)
 
 #define DECLARE_LITERAL_TEMP(v)			\
@@ -486,7 +466,7 @@ void Codec37Decoder::decode(byte *dst, const byte *src) {
 		error("codec37: missing opcode 1");
 		break;
 	case 2:
-		bompDecode(_deltaBufs[_curtable], src + 16, decoded_size);
+		bompDecodeLine(_deltaBufs[_curtable], src + 16, decoded_size);
 		if ((_deltaBufs[_curtable] - _deltaBuf) > 0) {
 			memset(_deltaBuf, 0, _deltaBufs[_curtable] - _deltaBuf);
 		}
diff --git a/scumm/smush/codec37.h b/scumm/smush/codec37.h
index 52f4504665..1031b93044 100644
--- a/scumm/smush/codec37.h
+++ b/scumm/smush/codec37.h
@@ -45,7 +45,6 @@ public:
 	void deinit();
 protected:
 	void maketable(int, int);
-	void bompDecode(byte *dst, const byte *src, int len);
 	void proc3WithFDFE(byte *dst, const byte *src, int32, int, int, int, int16 *);
 	void proc3WithoutFDFE(byte *dst, const byte *src, int32, int, int, int, int16 *);
 	void proc4WithFDFE(byte *dst, const byte *src, int32, int, int, int, int16 *);
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index f3f5858c69..f2a074402d 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "codec47.h"
+#include "scumm/bomp.h"
 
 #include "common/engine.h"
 
@@ -472,27 +473,6 @@ void Codec47Decoder::makeTables47(int32 width) {
 	} while (c < 32768);
 }
 
-void Codec47Decoder::bompDecode(byte *dst, const byte *src, int len) {
-	byte code;
-	byte color;
-	int32 num;
-
-	do {
-		code = *src++;
-		num = (code >> 1) + 1;
-		if (code & 1) {
-			color = *src++;
-			memset(dst, color, num);
-		} else {
-			memcpy(dst, src, num);
-			src += num;
-		}
-		dst += num;
-		len -= num;
-	} while (len > 0);
-	assert(len == 0);
-}
-
 void Codec47Decoder::level3(byte *d_dst) {
 	int32 tmp;
 	byte code = *_d_src++;
@@ -740,7 +720,7 @@ bool Codec47Decoder::decode(byte *dst, const byte *src) {
 		memcpy(_curBuf, _deltaBufs[0], _frameSize);
 		break;
 	case 5:
-		bompDecode(_curBuf, gfx_data, READ_LE_UINT32(src + 14));
+		bompDecodeLine(_curBuf, gfx_data, READ_LE_UINT32(src + 14));
 		break;
 	}
 
diff --git a/scumm/smush/codec47.h b/scumm/smush/codec47.h
index e900a6993e..f82f70f9ab 100644
--- a/scumm/smush/codec47.h
+++ b/scumm/smush/codec47.h
@@ -49,7 +49,6 @@ private:
 
 	void makeTables47(int32 width);
 	void makeTables37(int32 param);
-	void bompDecode(byte *dst, const byte *src, int len);
 	void level1(byte *d_dst);
 	void level2(byte *d_dst);
 	void level3(byte *d_dst);