[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.215,1.216 nut_renderer.cpp,1.46,1.47

[Max Horn]

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

Modified Files:
	string.cpp nut_renderer.cpp 
Log Message:
cleanup

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- string.cpp	8 Apr 2004 01:38:07 -0000	1.215
+++ string.cpp	8 Apr 2004 23:38:08 -0000	1.216
@@ -160,12 +160,6 @@
 	_talkDelay = 60;
 
 	if (!_keepText) {
-		if (_version <= 3 && _gameId != GID_LOOM) {
-// FIXME: Remove this commented out code eventually
-//			if (!_charset->_hasMask)
-//				warning("_hasMask mismatch (case C) - please report to Fingolfin");
-//			_charset->_hasMask = true;
-		}
 		_charset->restoreCharsetBg();
 	}
 
@@ -313,10 +307,9 @@
 
 	_charsetBufPos = buffer - _charsetBuffer;
 
-	// FIXME: Remove this and the next three lines eventually!
+	// 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", _charset->_hasMask);
-//	_charset->_hasMask = (_charset->_str.left != -1);
 }
 
 
@@ -445,10 +438,9 @@
 	_string[a].xpos = _charset->_str.right + 8;	// Indy3: Fixes Grail Diary text positioning
 
 	if (_version >= 7) {
-		// FIXME: Remove this and the next three lines eventually!
+		// FIXME: Remove this and the next two lines eventually!
 		if (!_charset->_hasMask)
 			warning("_hasMask mismatch (case B %d) - please report to Fingolfin", _charset->_hasMask);
-		_charset->_hasMask = true;
 	}
 }
 

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- nut_renderer.cpp	5 Apr 2004 18:45:40 -0000	1.46
+++ nut_renderer.cpp	8 Apr 2004 23:38:09 -0000	1.47
@@ -254,8 +254,6 @@
 	// This way we achieve the exact look as the original CMI had. However,
 	// the question remains whether they did it this way, too, or if there is
 	// some "font shadow" resource we don't know yet.
-	// One problem remains: the fonts on the save/load screen don't have a
-	// shadow. So how do we know whether to draw text with or without shadow?
 
 	int offsetX[7] = { -1,  0, 1, 0, 1, 2, 0 };
 	int offsetY[7] = {  0, -1, 0, 1, 2, 1, 0 };