[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.31,1.32 scumm.h,1.43,1.44

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv4145/scumm

Modified Files:
	string.cpp scumm.h 
Log Message:
get rid of obsolete variable

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- string.cpp	20 Oct 2002 13:19:15 -0000	1.31
+++ string.cpp	22 Oct 2002 13:04:39 -0000	1.32
@@ -954,7 +954,6 @@
 
 	_bpp = _unk2 = *ptr;
 	_invNumBits = 8 - _bpp;
-	_bitMask = 0xFF << _invNumBits;
 	_colorMap[1] = _color;
 
 	_charOffs = READ_LE_UINT32(ptr + chr * 4 + 4);
@@ -1080,7 +1079,7 @@
 		maskpos = 0;
 
 		for (x = 0; x < _width; x++) {
-			color = (bits & _bitMask) >> _invNumBits;
+			color = (bits >> _invNumBits) & 0xFF;
 			if (color) {
 				if (usemask) {
 					mask[maskpos] |= maskmask;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- scumm.h	21 Oct 2002 13:23:24 -0000	1.43
+++ scumm.h	22 Oct 2002 13:04:39 -0000	1.44
@@ -205,7 +205,6 @@
 	byte *_charPtr;
 	int _width, _height;
 	int _offsX, _offsY;
-	byte _bitMask;
 	int _bottom;
 	int _virtScreenHeight;