[Scummvm-cvs-logs] SF.net SVN: scummvm: [28464] scummvm/branches/branch-0-10-0/engines/agos/ charset.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Mon Aug 6 05:03:56 CEST 2007


Revision: 28464
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28464&view=rev
Author:   Kirben
Date:     2007-08-05 20:03:56 -0700 (Sun, 05 Aug 2007)

Log Message:
-----------
Fix bug #1768080 - FEEBLE: Wrong text display in Oracle. A regression, caused by slight difference in charset code for FF/PP.

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/agos/charset.cpp

Modified: scummvm/branches/branch-0-10-0/engines/agos/charset.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/charset.cpp	2007-08-06 03:01:15 UTC (rev 28463)
+++ scummvm/branches/branch-0-10-0/engines/agos/charset.cpp	2007-08-06 03:03:56 UTC (rev 28464)
@@ -539,7 +539,15 @@
 		doOutput(&chr, 1);
 		clsCheck(_textWindow);
 	} else if (chr == 0 || chr == ' ' || chr == 10) {
-		if (_printCharMaxPos - _printCharCurPos >= _printCharPixelCount) {
+		bool fit;
+
+		if (getGameType() == GType_FF || getGameType() == GType_PP) {
+			fit = _printCharMaxPos - _printCharCurPos > _printCharPixelCount;
+		} else {
+			fit = _printCharMaxPos - _printCharCurPos >= _printCharPixelCount;
+		}
+
+		if (fit) {
 			_printCharCurPos += _printCharPixelCount;
 			doOutput(_lettersToPrintBuf, _numLettersToPrint);
 


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




More information about the Scummvm-git-logs mailing list