[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.274,1.275

[kirben]

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

Modified Files:
	string.cpp 
Log Message:

Fix bug #1177489 - FM-TOWNS LOOM: Multiple text lines spacing incorrect
The string height setting is ignored in FM Towns version.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- string.cpp	4 Apr 2005 03:29:58 -0000	1.274
+++ string.cpp	6 Apr 2005 02:59:03 -0000	1.275
@@ -234,7 +234,7 @@
 			if (_charset->_center) {
 				_charset->_nextLeft -= _charset->getStringWidth(0, buffer) / 2;
 			}
-			if (_string[0].height) {
+			if (!(_features & GF_FMTOWNS) && _string[0].height) {
 				_charset->_nextTop += _string[0].height;
 			} else {
 				_charset->_nextTop += _charset->getFontHeight();
@@ -505,7 +505,7 @@
 				} else {
 					_charset->_left = _charset->_startLeft;
 				}
-				if (_string[0].height) {
+				if (!(_features & GF_FMTOWNS) && _string[0].height) {
 					_charset->_nextTop += _string[0].height;
 				} else {
 					_charset->_top += fontHeight;