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

[Kirben at users.sourceforge.net]

Revision: 27076
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27076&view=rev
Author:   Kirben
Date:     2007-06-03 22:05:02 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
Change printChar variables to signed, to allow removal of work around for The Feeble Files.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/charset.cpp

Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp	2007-06-04 05:02:22 UTC (rev 27075)
+++ scummvm/trunk/engines/agos/charset.cpp	2007-06-04 05:05:02 UTC (rev 27076)
@@ -539,19 +539,7 @@
 		doOutput(&chr, 1);
 		clsCheck(_textWindow);
 	} else if (chr == 0 || chr == ' ' || chr == 10) {
-		bool fit;
-
-		// Note that in FF, _printCharCurPos may be greater than
-		// _printCharMaxPos. In Simon, that is probably prevented by
-		// testing if _printCharCurPos == _printCharMaxPos below.
-
-		if (getGameType() == GType_FF || getGameType() == GType_PP) {
-			fit = _printCharMaxPos > _printCharCurPos + _printCharPixelCount;
-		} else {
-			fit = _printCharMaxPos - _printCharCurPos >= _printCharPixelCount;
-		}
-
-		if (fit) {
+		if (_printCharMaxPos - _printCharCurPos >= _printCharPixelCount) {
 			_printCharCurPos += _printCharPixelCount;
 			doOutput(_lettersToPrintBuf, _numLettersToPrint);
 


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