[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.270,1.271
kirben
kirben at users.sourceforge.net
Fri Mar 18 15:32:55 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31992/scumm
Modified Files:
string.cpp
Log Message:
Applies to drawString() too.
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- string.cpp 18 Mar 2005 15:04:37 -0000 1.270
+++ string.cpp 18 Mar 2005 23:31:58 -0000 1.271
@@ -434,7 +434,6 @@
fontHeight = _charset->getFontHeight();
-
// trim from the right
byte *tmp = buf;
space = NULL;
@@ -491,7 +490,11 @@
} else {
_charset->_left = _charset->_startLeft;
}
- _charset->_top += fontHeight;
+ if (_string[0].height) {
+ _charset->_nextTop += _string[0].height;
+ } else {
+ _charset->_top += fontHeight;
+ }
break;
case 12:
color = buf[i] + (buf[i + 1] << 8);
More information about the Scummvm-git-logs
mailing list