aboutsummaryrefslogtreecommitdiff
path: root/scumm/bomp.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-30 19:09:41 +0000
committerMax Horn2003-05-30 19:09:41 +0000
commitfd6dd176850b28ef650f180904c457e496cb1c4e (patch)
treeb7df07487e87342fe084c1f8151fa7232bb7267c /scumm/bomp.cpp
parentc6b35e15a0d541ba0ca89f983743cafa4e082cd2 (diff)
downloadscummvm-rg350-fd6dd176850b28ef650f180904c457e496cb1c4e.tar.gz
scummvm-rg350-fd6dd176850b28ef650f180904c457e496cb1c4e.tar.bz2
scummvm-rg350-fd6dd176850b28ef650f180904c457e496cb1c4e.zip
made decompressBomp use bompDecodeLine
svn-id: r8152
Diffstat (limited to 'scumm/bomp.cpp')
-rw-r--r--scumm/bomp.cpp24
1 files changed, 1 insertions, 23 deletions
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp
index acd664783c..38df197cf7 100644
--- a/scumm/bomp.cpp
+++ b/scumm/bomp.cpp
@@ -41,31 +41,9 @@ void decompressBomp(byte *dst, const byte *src, int w, int h) {
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
+ dst += w;
} while (--h);
}