[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.257,1.258

Max Horn fingolfin at users.sourceforge.net
Fri Oct 1 02:04:03 CEST 2004


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

Modified Files:
	string.cpp 
Log Message:
cleanup

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- string.cpp	29 Sep 2004 22:06:24 -0000	1.257
+++ string.cpp	1 Oct 2004 09:03:01 -0000	1.258
@@ -712,32 +712,26 @@
 		buf = _blastTextQueue[i].text;
 
 		_charset->_top = _blastTextQueue[i].ypos + _screenTop;
-		_charset->_startLeft = _charset->_left = _blastTextQueue[i].xpos;
+		_charset->_left = _blastTextQueue[i].xpos;
 		_charset->_right = _screenWidth - 1;
 		_charset->_center = _blastTextQueue[i].center;
 		_charset->setColor(_blastTextQueue[i].color);
 		_charset->_disableOffsX = _charset->_firstChar = true;
 		_charset->setCurID(_blastTextQueue[i].charset);
-		_charset->_nextLeft = _blastTextQueue[i].xpos;
-		_charset->_nextTop = _charset->_top;
 
 		// Center text if necessary
 		if (_charset->_center) {
-			_charset->_nextLeft -= _charset->getStringWidth(0, buf) / 2;
-			if (_charset->_nextLeft < 0)
-				_charset->_nextLeft = 0;
+			_charset->_left -= _charset->getStringWidth(0, buf) / 2;
+			if (_charset->_left < 0)
+				_charset->_left = 0;
 		}
 
 		do {
 			c = *buf++;
 			if (c != 0 && c != 0xFF) {
-				_charset->_left = _charset->_nextLeft;
-				_charset->_top = _charset->_nextTop;
 				if (c >= 0x80 && _useCJKMode)
 					c += *buf++ * 256;
 				_charset->printChar(c);
-				_charset->_nextLeft = _charset->_left;
-				_charset->_nextTop = _charset->_top;
 			}
 		} while (c);
 





More information about the Scummvm-git-logs mailing list