[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.232,1.233

Max Horn fingolfin at users.sourceforge.net
Sun Aug 8 15:40:02 CEST 2004


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

Modified Files:
	string.cpp 
Log Message:
Remove these warnings -- no reports came in all the time anyway, and things seem to work fine

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- string.cpp	2 Aug 2004 20:55:35 -0000	1.232
+++ string.cpp	8 Aug 2004 22:39:07 -0000	1.233
@@ -310,10 +310,6 @@
 	// TODO Verify this is correct spot
 	if (_version == 8)
 		VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1;
-
-	// FIXME: Remove this and the next two lines eventually!
-	if (_charset->_hasMask != (_charset->_str.left != -1))
-		warning("_hasMask mismatch (case A %d) - please report to Fingolfin if you notice any text/graphics glitches related to this!", _charset->_hasMask);
 }
 
 void ScummEngine::drawString(int a, const byte *msg) {
@@ -427,14 +423,7 @@
 		_charset->_nextTop = _charset->_top;
 	}
 
-
 	_string[a].xpos = _charset->_str.right + 8;	// Indy3: Fixes Grail Diary text positioning
-
-	if (_version >= 7) {
-		// FIXME: Remove this and the next two lines eventually!
-		if (!_charset->_hasMask)
-			warning("_hasMask mismatch (case B %d) - please report to Fingolfin if you notice any text/graphics glitches related to this!", _charset->_hasMask);
-	}
 }
 
 int ScummEngine::addMessageToStack(const byte *msg, byte *dst, int dstSize) {





More information about the Scummvm-git-logs mailing list