diff options
| author | Max Horn | 2004-08-08 22:10:38 +0000 |
|---|---|---|
| committer | Max Horn | 2004-08-08 22:10:38 +0000 |
| commit | 835ef5f0127718959425dfdd7c123cf14ce13829 (patch) | |
| tree | 38beec4b02a7fdf0d08fd22fdd7f2e2b9ab07cee /scumm/bomp.cpp | |
| parent | f8cc6c22416c0e9615abfdd98fc2e86852e897a9 (diff) | |
| download | scummvm-rg350-835ef5f0127718959425dfdd7c123cf14ce13829.tar.gz scummvm-rg350-835ef5f0127718959425dfdd7c123cf14ce13829.tar.bz2 scummvm-rg350-835ef5f0127718959425dfdd7c123cf14ce13829.zip | |
Patch #1003866 (SCUMM: New text rendering code (fixes various bugs))
svn-id: r14521
Diffstat (limited to 'scumm/bomp.cpp')
| -rw-r--r-- | scumm/bomp.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp index 89daf4061d..17ead8a804 100644 --- a/scumm/bomp.cpp +++ b/scumm/bomp.cpp @@ -199,7 +199,6 @@ void ScummEngine::drawBomp(const BompDrawData &bd, bool mirror) { const byte *src; byte *dst; byte *mask = 0; - byte *charset_mask; Common::Rect clip; byte *scalingYPtr = bd.scalingYPtr; byte skip_y_bits = 0x80; @@ -234,10 +233,7 @@ void ScummEngine::drawBomp(const BompDrawData &bd, bool mirror) { const byte maskbit = revBitMask[(bd.x + clip.left) & 7]; - // Always mask against the charset mask - charset_mask = getMaskBuffer(bd.x + clip.left, bd.y, 0); - - // Also mask against any additionally imposed mask + // Mask against any additionally imposed mask if (bd.maskPtr) { mask = bd.maskPtr + (bd.y * gdi._numStrips) + ((bd.x + clip.left) / 8); } @@ -310,7 +306,6 @@ void ScummEngine::drawBomp(const BompDrawData &bd, bool mirror) { // Replace the parts of the line which are masked with the transparency color if (bd.maskPtr) bompApplyMask(line_ptr, mask, maskbit, width, 255); - bompApplyMask(line_ptr, charset_mask, maskbit, width, 255); // Apply custom color map, if available if (_bompActorPalettePtr) @@ -324,7 +319,6 @@ void ScummEngine::drawBomp(const BompDrawData &bd, bool mirror) { // Advance to the next line pos_y++; mask += gdi._numStrips; - charset_mask += gdi._numStrips; dst += bd.outwidth; } } |