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

[kirben at users.sourceforge.net]

Revision: 21737
Author:   kirben
Date:     2006-04-09 15:41:52 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21737&view=rev

Log Message:
-----------
Adjust line breaks, to prevent regression.

Modified Paths:
--------------
    scummvm/trunk/engines/simon/charset.cpp
Modified: scummvm/trunk/engines/simon/charset.cpp
===================================================================
--- scummvm/trunk/engines/simon/charset.cpp	2006-04-09 22:18:48 UTC (rev 21736)
+++ scummvm/trunk/engines/simon/charset.cpp	2006-04-09 22:41:52 UTC (rev 21737)
@@ -317,9 +317,9 @@
 		print_char_helper_1(&chr, 1);
 		print_char_helper_5(_textWindow);
 	} else if (chr == 0 || chr == ' ' || chr == 10) {
-		uint count = (getGameType() == GType_FF) ? _printCharPixelCount : _numLettersToPrint;
-		if (_printCharMaxPos - _printCharCurPos > count) {
-			_printCharCurPos += count;
+		uint count = (getGameType() == GType_FF) ? _printCharPixelCount + 1: _numLettersToPrint;
+		if (_printCharMaxPos - _printCharCurPos >= count) {
+			_printCharCurPos += _printCharPixelCount;
 			print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
 
 			if (_printCharCurPos == _printCharMaxPos) {
@@ -330,11 +330,11 @@
 				if (chr == 10)
 					_printCharCurPos = 0;
 				else if (chr != 0)
-					_printCharCurPos += (getGameType() == GType_FF) ? feebleFontSize[chr - 32] : 1;
+					_printCharCurPos += _printCharPixelCount;
 			}
 		} else {
 			const byte newline_character = 10;
-			_printCharCurPos = (getGameType() == GType_FF) ? _printCharPixelCount : _numLettersToPrint;
+			_printCharCurPos = _printCharPixelCount;
 			print_char_helper_1(&newline_character, 1);
 			print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
 			if (chr == ' ') {
@@ -349,8 +349,7 @@
 		_printCharPixelCount = 0;
 	} else {
 		_lettersToPrintBuf[_numLettersToPrint++] = chr;
-		if (getGameType() == GType_FF)
-			_printCharPixelCount += feebleFontSize[chr - 32];
+		_printCharPixelCount += (getGameType() == GType_FF) ? feebleFontSize[chr - 32] : 1;
 	}
 }
 


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