aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-04-09 15:34:14 +0000
committerTravis Howell2006-04-09 15:34:14 +0000
commit468480209183f4fc05bfd1395ec70f07d600fe83 (patch)
tree6342c8e65f6801943fe625c2439ba6c6cba98035
parentb75be44d06ca37c5757ea95e6f36538b4e2e3afa (diff)
downloadscummvm-rg350-468480209183f4fc05bfd1395ec70f07d600fe83.tar.gz
scummvm-rg350-468480209183f4fc05bfd1395ec70f07d600fe83.tar.bz2
scummvm-rg350-468480209183f4fc05bfd1395ec70f07d600fe83.zip
Fix some line breaks in oracle of FF
svn-id: r21730
-rw-r--r--engines/simon/charset.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/simon/charset.cpp b/engines/simon/charset.cpp
index 87d1b943fc..340c5ac0a5 100644
--- a/engines/simon/charset.cpp
+++ b/engines/simon/charset.cpp
@@ -317,10 +317,9 @@ void SimonEngine::showmessage_print_char(byte chr) {
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 @@ void SimonEngine::showmessage_print_char(byte chr) {
}
} 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 == ' ') {