aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-08-06 03:01:15 +0000
committerTravis Howell2007-08-06 03:01:15 +0000
commit9edf4eaf3f8754c2e26d40e87a7043065e106e07 (patch)
tree4e38acc453ff9bdb771613c06907b92839d2d660
parentec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff)
downloadscummvm-rg350-9edf4eaf3f8754c2e26d40e87a7043065e106e07.tar.gz
scummvm-rg350-9edf4eaf3f8754c2e26d40e87a7043065e106e07.tar.bz2
scummvm-rg350-9edf4eaf3f8754c2e26d40e87a7043065e106e07.zip
Fix bug #1768080 - FEEBLE: Wrong text display in Oracle. A regression, caused by slight difference in charset code for FF/PP.
svn-id: r28463
-rw-r--r--engines/agos/charset.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp
index 9a37d90c33..005b3fe549 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.cpp
@@ -543,7 +543,15 @@ void AGOSEngine::justifyOutPut(byte chr) {
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 (_printCharMaxPos - _printCharCurPos > _printCharPixelCount) {
_printCharCurPos += _printCharPixelCount;
doOutput(_lettersToPrintBuf, _numLettersToPrint);