[Scummvm-cvs-logs] SF.net SVN: scummvm: [23706] scummvm/trunk

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Aug 13 08:32:22 CEST 2006


Revision: 23706
Author:   eriktorbjorn
Date:     2006-08-12 23:32:16 -0700 (Sat, 12 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23706&view=rev

Log Message:
-----------
Made FF use the same max length for every line when word-wrapping subtitles,
rather than using the length of the previous line. This fixes bug #1536401.

Modified Paths:
--------------
    scummvm/trunk/NEWS
    scummvm/trunk/engines/simon/string.cpp
Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS	2006-08-12 17:24:49 UTC (rev 23705)
+++ scummvm/trunk/NEWS	2006-08-13 06:32:16 UTC (rev 23706)
@@ -30,6 +30,7 @@
  Simon
    - Improved support for international versions of the Feeble Files.
    - Fixed undefined behaviour when loading music.
+   - Fixed crash when displaying some subtitles in the Feeble Files.
 
  Broken Sword 2
    - More robust handling of the optional startup.inf file.

Modified: scummvm/trunk/engines/simon/string.cpp
===================================================================
--- scummvm/trunk/engines/simon/string.cpp	2006-08-12 17:24:49 UTC (rev 23705)
+++ scummvm/trunk/engines/simon/string.cpp	2006-08-13 06:32:16 UTC (rev 23706)
@@ -365,16 +365,15 @@
 
 	if (getGameType() == GType_FF) {
 		uint16 b, pixels, spaces;
-		uint16 curWdth = width;
 
 		while (1) {
-			string2 = getPixelLength(string, curWdth, pixels);
+			string2 = getPixelLength(string, width, pixels);
 			if (*string2 == 0) {
 				spaces = (width - pixels) / 12;
 				if (spaces != 0)
 					spaces--;
 				while (spaces) {
-	    				*convertedString2++=' ';
+	    				*convertedString2++ = ' ';
 	    				spaces--;
 				}
 				strcpy(convertedString2, string);
@@ -400,7 +399,6 @@
 			y -= textHeight;
 			if (y < 2)
 			    y = 2;
-			curWdth = pixels;
 			string = string2;
 		}
 	} else {


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