[Scummvm-cvs-logs] SF.net SVN: scummvm:[48779] scummvm/trunk/engines/sci/graphics/text16.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Apr 23 23:57:30 CEST 2010


Revision: 48779
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48779&view=rev
Author:   m_kiewitz
Date:     2010-04-23 21:57:29 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
SCI: fix for regression of r48778: do add spaces to width, if we are at ending of text - the whole change may be wrong altogether

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/text16.cpp

Modified: scummvm/trunk/engines/sci/graphics/text16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-23 21:18:16 UTC (rev 48778)
+++ scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-23 21:57:29 UTC (rev 48779)
@@ -267,8 +267,8 @@
 					break;
 				}
 			default:
-				// if last character is a space, don't add it to textWidth
-				if ((curChar == ' ') && (!len))
+				// if last character is a space and the text is not ending afterwards, don't add it to textWidth
+				if ((curChar == ' ') && (!len) && (*text != 0))
 					break;
 				textHeight = MAX<int16> (textHeight, _ports->_curPort->fontHeight);
 				textWidth += _font->getCharWidth(curChar);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list