[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.112,2.113

[Max Horn]

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

Modified Files:
	charset.cpp 
Log Message:
Fixed text rendering in vertical scrolling rooms in COMI (I hope), fixes bug #1036707 (COMI: Subtitles positioned incorrect)

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.112
retrieving revision 2.113
diff -u -d -r2.112 -r2.113
--- charset.cpp	29 Sep 2004 09:47:38 -0000	2.112
+++ charset.cpp	1 Oct 2004 09:06:12 -0000	2.113
@@ -1515,15 +1515,18 @@
 		_hasMask = true;
 		_textScreenID = kMainVirtScreen;
 	}
+	
+	int drawTop = _top;
 	if (_ignoreCharsetMask) {
 		VirtScreen *vs = &_vm->virtscr[kMainVirtScreen];
 		s = *vs;
-		s.pixels = vs->getPixels(0, _vm->_screenTop);
+		s.pixels = vs->getPixels(0, 0);
 	} else {
 		s = _vm->gdi._textSurface;
+		drawTop -= _vm->_screenTop;
 	}
 
-	_current->drawShadowChar(s, chr, _left, _top, _color, _curId != 3);
+	_current->drawShadowChar(s, chr, _left, drawTop, _color, _curId != 3);
 	_vm->markRectAsDirty(kMainVirtScreen, shadow);
 
 	if (_str.left > _left)