[Scummvm-cvs-logs] SF.net SVN: scummvm: [23707] scummvm/branches/branch-0-9-0

[eriktorbjorn at users.sourceforge.net]

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

Log Message:
-----------
Backported fix for FF word-wrapping problem, bug #1536401.

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/NEWS
    scummvm/branches/branch-0-9-0/engines/simon/string.cpp
Modified: scummvm/branches/branch-0-9-0/NEWS
===================================================================
--- scummvm/branches/branch-0-9-0/NEWS	2006-08-13 06:32:16 UTC (rev 23706)
+++ scummvm/branches/branch-0-9-0/NEWS	2006-08-13 06:33:47 UTC (rev 23707)
@@ -17,6 +17,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/branches/branch-0-9-0/engines/simon/string.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/simon/string.cpp	2006-08-13 06:32:16 UTC (rev 23706)
+++ scummvm/branches/branch-0-9-0/engines/simon/string.cpp	2006-08-13 06:33:47 UTC (rev 23707)
@@ -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.