diff options
| author | Eugene Sandulenko | 2008-08-02 21:36:08 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2008-08-02 21:36:08 +0000 |
| commit | 39449357af4b443d4ee9247ae800db7619d54870 (patch) | |
| tree | 4922dba996e28bd4e4a720cb9cb506ffb1651c34 | |
| parent | 7e808d771434f893f67e8c64d95f826614c46594 (diff) | |
| download | scummvm-rg350-39449357af4b443d4ee9247ae800db7619d54870.tar.gz scummvm-rg350-39449357af4b443d4ee9247ae800db7619d54870.tar.bz2 scummvm-rg350-39449357af4b443d4ee9247ae800db7619d54870.zip | |
Fix bug #2023727: "MONKEY2: Misplaced Text"
svn-id: r33544
| -rw-r--r-- | engines/scumm/charset.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/string.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 5a45fb7da9..e60c2f0a59 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -49,7 +49,7 @@ void ScummEngine::loadCJKFont() { Common::File fp; _useCJKMode = false; _textSurfaceMultiplier = 1; - _newLineCharacter = 0xfe; + _newLineCharacter = 0; if (_game.version <= 5 && _game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) { // FM-TOWNS v3 / v5 Kanji int numChar = 256 * 32; diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index f039e2ca23..700632e4b3 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -279,7 +279,7 @@ bool ScummEngine::handleNextCharsetCode(Actor *a, int *code) { } c = *buffer++; - if (c == _newLineCharacter) { + if (_newLineCharacter != 0 && c == _newLineCharacter) { c = 13; break; } |