[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.238,1.239 scumm.h,1.439,1.440

[Max Horn]

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

Modified Files:
	string.cpp scumm.h 
Log Message:
cleanup

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- string.cpp	14 Aug 2004 11:49:01 -0000	1.238
+++ string.cpp	14 Aug 2004 16:30:39 -0000	1.239
@@ -110,8 +110,9 @@
 			s = a->scaley * a->talkPosY / 0xFF;
 			_string[0].ypos = ((a->talkPosY - s) / 2) + s - a->getElevation() + a->_pos.y;
 
-			if (_string[0].ypos < _screenTop)
+			if (_string[0].ypos < _screenTop) {
 				_string[0].ypos = _screenTop;
+			}
 
 			s = a->scalex * a->talkPosX / 0xFF;
 			_string[0].xpos = ((a->talkPosX - s) / 2) + s + a->_pos.x - camera._cur.x + (_screenWidth / 2);
@@ -128,16 +129,15 @@
 
 	_charset->_top = _string[0].ypos + _screenTop;
 	_charset->_startLeft = _charset->_left = _string[0].xpos;
+	_charset->_right = _string[0].right;
+	_charset->_center = _string[0].center;
+	_charset->setColor(_charsetColor);
 
 	if (a && a->charset)
 		_charset->setCurID(a->charset);
 	else
 		_charset->setCurID(_string[0].charset);
 
-	_charset->_center = _string[0].center;
-	_charset->_right = _string[0].right;
-	_charset->setColor(_charsetColor);
-
 	if (_version >= 5)
 		for (i = 0; i < 4; i++)
 			_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -d -r1.439 -r1.440
--- scumm.h	14 Aug 2004 15:23:44 -0000	1.439
+++ scumm.h	14 Aug 2004 16:30:39 -0000	1.440
@@ -986,7 +986,7 @@
 
 public:
 	int _screenStartStrip, _screenEndStrip;
-	int 	_screenTop;
+	int _screenTop;
 
 protected:
 	int _blastObjectQueuePos;