From eae0ab3a9fac1849259928302b25e7085b06b7a0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 14 Aug 2004 00:17:49 +0000
Subject: Fix for bug #1008621 and #1008622

svn-id: r14587
---
 scumm/charset.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 521ab701b2..a589c43062 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -1098,7 +1098,7 @@ void CharsetRendererClassic::printChar(int chr) {
 	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 @@ void CharsetRendererClassic::printChar(int chr) {
 	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) {
-- 
cgit v1.2.3