[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.395,2.396

Max Horn fingolfin at users.sourceforge.net
Sun Mar 6 15:37:06 CET 2005


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

Modified Files:
	gfx.cpp 
Log Message:
Fix for bug #1107815 (SAM: Conroy Bumpus' song subtitles always present)

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.395
retrieving revision 2.396
diff -u -d -r2.395 -r2.396
--- gfx.cpp	6 Mar 2005 00:46:12 -0000	2.395
+++ gfx.cpp	6 Mar 2005 23:36:37 -0000	2.396
@@ -1005,6 +1005,10 @@
 			error("can only copy bg to main window");
 		bgbuff = vs->getBackPixels(x, y);
 		blit(backbuff, vs->pitch, bgbuff, vs->pitch, width, height);
+		if (_charset->_hasMask) {
+			byte *mask = (byte *)gdi._textSurface.pixels + gdi._textSurface.pitch * (y - _screenTop) + x;
+			fill(mask, gdi._textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width, height);
+		}
 	} else {
 		fill(backbuff, vs->pitch, color, width, height);
 	}





More information about the Scummvm-git-logs mailing list