[Scummvm-cvs-logs] SF.net SVN: scummvm:[40985] scummvm/trunk/engines/cruise/font.cpp

[dreammaster at users.sourceforge.net]

Revision: 40985
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40985&view=rev
Author:   dreammaster
Date:     2009-05-29 11:47:32 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Bugfix for rendering text that caused corruption when the width was an odd number and a line was completely filled

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/font.cpp

Modified: scummvm/trunk/engines/cruise/font.cpp
===================================================================
--- scummvm/trunk/engines/cruise/font.cpp	2009-05-29 11:45:33 UTC (rev 40984)
+++ scummvm/trunk/engines/cruise/font.cpp	2009-05-29 11:47:32 UTC (rev 40985)
@@ -207,7 +207,7 @@
 	int j;
 	const uint8 *fontPtr_Data2 = fontPtr_Data + height * 2;
 
-	outBufferPtr += yOffset * width * 2 + xOffset;
+	outBufferPtr += yOffset * width + xOffset;
 
 	for (i = 0; i < height; i++) {	// y++
 		uint16 bitSet1 = READ_BE_UINT16(fontPtr_Data);
@@ -223,7 +223,7 @@
 			bitSet1 <<= 1;
 			bitSet2 <<= 1;
 		}
-		outBufferPtr += (width * 2) - charWidth;
+		outBufferPtr += width - charWidth;
 	}
 }
 
@@ -421,7 +421,7 @@
 						           FROM_LE_16(fe.charHeight),
 								   FROM_LE_16(fe.v1),
 						           stringRenderBufferSize,
-						           stringWidth / 2,
+						           stringWidth,
 								   (int16)FROM_LE_16(fe.charWidth));
 
 						drawPosPixel_X +=


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