[Scummvm-cvs-logs] SF.net SVN: scummvm: [21740] scummvm/trunk/engines/simon/charset.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 21740
Author:   eriktorbjorn
Date:     2006-04-09 20:51:04 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21740&view=rev

Log Message:
-----------
Fixed line breaking regression caused by adding the width of the word a second
time, rather than the width of a blankspace character.

Modified Paths:
--------------
    scummvm/trunk/engines/simon/charset.cpp
Modified: scummvm/trunk/engines/simon/charset.cpp
===================================================================
--- scummvm/trunk/engines/simon/charset.cpp	2006-04-09 23:30:16 UTC (rev 21739)
+++ scummvm/trunk/engines/simon/charset.cpp	2006-04-10 03:51:04 UTC (rev 21740)
@@ -317,7 +317,7 @@
 		print_char_helper_1(&chr, 1);
 		print_char_helper_5(_textWindow);
 	} else if (chr == 0 || chr == ' ' || chr == 10) {
-		uint count = (getGameType() == GType_FF) ? _printCharPixelCount + 1: _printCharPixelCount;
+		uint count = (getGameType() == GType_FF) ? _printCharPixelCount + 1 : _printCharPixelCount;
 		if (_printCharMaxPos - _printCharCurPos >= count) {
 			_printCharCurPos += _printCharPixelCount;
 			print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
@@ -330,7 +330,7 @@
 				if (chr == 10)
 					_printCharCurPos = 0;
 				else if (chr != 0)
-					_printCharCurPos += _printCharPixelCount;
+					_printCharCurPos += (getGameType() == GType_FF) ? feebleFontSize[chr - 32] : 1;
 			}
 		} else {
 			const byte newline_character = 10;


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