[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.104,2.105 charset.cpp,2.19,2.20

[Max Horn]

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

Modified Files:
	scummvm.cpp charset.cpp 
Log Message:
typo/cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- scummvm.cpp	27 Apr 2003 17:44:40 -0000	2.104
+++ scummvm.cpp	28 Apr 2003 12:36:21 -0000	2.105
@@ -1014,7 +1014,7 @@
 	}
 
 	//
-	// Load sccale data
+	// Load scale data
 	//
 	if (_features & GF_OLD_BUNDLE)
 		ptr = 0;	// TODO ?

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- charset.cpp	27 Apr 2003 18:49:25 -0000	2.19
+++ charset.cpp	28 Apr 2003 12:36:21 -0000	2.20
@@ -234,18 +234,18 @@
 	}
 
 	// FIXME
-	if (_left < _strLeft)
+	if (_strLeft > _left)
 		_strLeft = _left;
 
 	_left += getCharWidth(chr);
 
-	if (_left > _strRight) {
+	if (_strRight < _left) {
 		_strRight = _left;
 		if (_dropShadow)
 			_strRight++;
 	}
 
-	if (_top + h > _strBottom)
+	if (_strBottom < _top + h)
 		_strBottom = _top + h;
 }