aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-10-19 07:06:10 +0000
committerTravis Howell2005-10-19 07:06:10 +0000
commitd3b96e431ce6480446672cec9ab25f2353dbeef7 (patch)
treee43b6bf0b0fbd0aaa9ca01d032e0ba9a3c8cd3e2 /scumm
parent12a66937cc582d350ad62cc52a4aa224df00f42c (diff)
downloadscummvm-rg350-d3b96e431ce6480446672cec9ab25f2353dbeef7.tar.gz
scummvm-rg350-d3b96e431ce6480446672cec9ab25f2353dbeef7.tar.bz2
scummvm-rg350-d3b96e431ce6480446672cec9ab25f2353dbeef7.zip
Fix TMSK in HE games.
svn-id: r19168
Diffstat (limited to 'scumm')
-rw-r--r--scumm/gfx.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index b185c06138..761cd5982b 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -1951,7 +1951,6 @@ void Gdi::decompressTMSK(byte *dst, const byte *tmsk, const byte *src, int heigh
}
}
-
if (srcFlag == 0) {
srcbits = *src++;
}
@@ -1973,9 +1972,10 @@ void Gdi::decompressTMSK(byte *dst, const byte *tmsk, const byte *src, int heigh
maskCount--;
- *dst = (*dst & ~maskbits) | (srcbits & maskbits);
+ *dst |= srcbits;
+ *dst &= ~maskbits;
- dst += 80;
+ dst += _numStrips;
height--;
}
}