[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.129,2.130

Eugene Sandulenko sev at users.sourceforge.net
Tue Mar 22 20:23:18 CET 2005


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

Modified Files:
	charset.cpp 
Log Message:
Fix MM NES text rendering so old messages are cleared up correctly.


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.129
retrieving revision 2.130
diff -u -d -r2.129 -r2.130
--- charset.cpp	21 Mar 2005 23:51:28 -0000	2.129
+++ charset.cpp	23 Mar 2005 04:22:11 -0000	2.130
@@ -1781,8 +1781,14 @@
 		_hasMask = true;
 		_textScreenID = vs->number;
 	}
-	dst = (byte *)_vm->gdi._textSurface.pixels + _top * _vm->gdi._textSurface.pitch + _left;
-	drawBits1(_vm->gdi._textSurface, dst, charPtr, drawTop, origWidth, origHeight);
+
+	if (_ignoreCharsetMask || !vs->hasTwoBuffers) {
+		dst = vs->getPixels(_left, drawTop);
+		drawBits1(*vs, dst, charPtr, drawTop, origWidth, origHeight);
+	} else {
+		dst = (byte *)_vm->gdi._textSurface.pixels + _top * _vm->gdi._textSurface.pitch + _left;
+		drawBits1(_vm->gdi._textSurface, dst, charPtr, drawTop, origWidth, origHeight);
+	}
 
 	if (_str.left > _left)
 		_str.left = _left;





More information about the Scummvm-git-logs mailing list