[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.95,2.96

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13346

Modified Files:
	charset.cpp 
Log Message:
Fix for bug #1008621 and #1008622

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.95
retrieving revision 2.96
diff -u -d -r2.95 -r2.96
--- charset.cpp	10 Aug 2004 21:54:29 -0000	2.95
+++ charset.cpp	14 Aug 2004 00:17:49 -0000	2.96
@@ -1098,7 +1098,7 @@
 	if (_ignoreCharsetMask || !vs->hasTwoBuffers) {
 		dst = vs->screenPtr + vs->xstart + drawTop * vs->width + _left;
 	} else {
-		dst = (byte *)_vm->gdi._textSurface.pixels + _top * _vm->gdi._textSurface.pitch + _left;
+		dst = (byte *)_vm->gdi._textSurface.pixels + (_top - _vm->_screenTop) * _vm->gdi._textSurface.pitch + _left;
 	}
 
 	back = dst;
@@ -1109,8 +1109,7 @@
 	if (is2byte) {
 		drawBits1(vs, dst, charPtr, drawTop, origWidth, origHeight);
 	} else {
-		byte bpp = *_fontPtr;
-		drawBitsN(vs, dst, charPtr, bpp, drawTop, origWidth, origHeight);
+		drawBitsN(vs, dst, charPtr, *_fontPtr, drawTop, origWidth, origHeight);
 	}
 
 	if (_blitAlso && vs->hasTwoBuffers) {