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

[kirben at users.sourceforge.net]

Revision: 21730
Author:   kirben
Date:     2006-04-09 08:34:14 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21730&view=rev

Log Message:
-----------
Fix some line breaks in oracle of FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/charset.cpp
Modified: scummvm/trunk/engines/simon/charset.cpp
===================================================================
--- scummvm/trunk/engines/simon/charset.cpp	2006-04-09 14:51:49 UTC (rev 21729)
+++ scummvm/trunk/engines/simon/charset.cpp	2006-04-09 15:34:14 UTC (rev 21730)
@@ -317,10 +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;
-
+		uint count = (getGameType() == GType_FF) ? _printCharPixelCount - 1 : _numLettersToPrint;
 		if (_printCharMaxPos - _printCharCurPos >= count) {
-			_printCharCurPos += count;
+			_printCharCurPos += (getGameType() == GType_FF) ? _printCharPixelCount : _numLettersToPrint;
 			print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
 
 			if (_printCharCurPos == _printCharMaxPos) {
@@ -335,7 +334,7 @@
 			}
 		} else {
 			const byte newline_character = 10;
-			_printCharCurPos = count;
+			_printCharCurPos = (getGameType() == GType_FF) ? _printCharPixelCount : _numLettersToPrint;
 			print_char_helper_1(&newline_character, 1);
 			print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
 			if (chr == ' ') {


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