aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2002-10-22 13:04:39 +0000
committerMax Horn2002-10-22 13:04:39 +0000
commit22f1d049fbfdb1d2cb2915b6b9bb6309e736df7c (patch)
tree004006c5fd5ad84cd5a272f0d7b1f53dec01258d /scumm
parentd73c2065790e8721d53ce3b3de3f92f1ac6cc68b (diff)
downloadscummvm-rg350-22f1d049fbfdb1d2cb2915b6b9bb6309e736df7c.tar.gz
scummvm-rg350-22f1d049fbfdb1d2cb2915b6b9bb6309e736df7c.tar.bz2
scummvm-rg350-22f1d049fbfdb1d2cb2915b6b9bb6309e736df7c.zip
get rid of obsolete variable
svn-id: r5245
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.h1
-rw-r--r--scumm/string.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 255913c860..18d04b4ac5 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -205,7 +205,6 @@ struct CharsetRenderer {
byte *_charPtr;
int _width, _height;
int _offsX, _offsY;
- byte _bitMask;
int _bottom;
int _virtScreenHeight;
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 8bbda572ea..ca627ecc74 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -954,7 +954,6 @@ void CharsetRenderer::printChar(int chr)
_bpp = _unk2 = *ptr;
_invNumBits = 8 - _bpp;
- _bitMask = 0xFF << _invNumBits;
_colorMap[1] = _color;
_charOffs = READ_LE_UINT32(ptr + chr * 4 + 4);
@@ -1080,7 +1079,7 @@ void CharsetRenderer::drawBits()
maskpos = 0;
for (x = 0; x < _width; x++) {
- color = (bits & _bitMask) >> _invNumBits;
+ color = (bits >> _invNumBits) & 0xFF;
if (color) {
if (usemask) {
mask[maskpos] |= maskmask;