[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.35,2.36

Max Horn fingolfin at users.sourceforge.net
Sun Jun 1 07:12:18 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv6474

Modified Files:
	charset.cpp 
Log Message:
This didn't look logical, and could (in theory) lead to mask being drawn but _hasMask not being set. I suspect it was a bug in the original commit adding this (back in the original string.cpp, rev. 1.5). Even if this change should turn out ot be incorrect, the original code most probably was incorrect anyway

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- charset.cpp	25 May 2003 20:38:44 -0000	2.35
+++ charset.cpp	1 Jun 2003 14:07:14 -0000	2.36
@@ -706,7 +706,7 @@
 
 	if (vs->number != 0)
 		_blitAlso = false;
-	if (vs->number == 0 && !_blitAlso)
+	if (vs->number == 0 && !_ignoreCharsetMask)
 		_hasMask = true;
 
 	_charPtr += 4;





More information about the Scummvm-git-logs mailing list