diff options
Diffstat (limited to 'engines/scumm/string.cpp')
| -rw-r--r-- | engines/scumm/string.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index bd92416a3a..ae795a0657 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -567,6 +567,15 @@ void ScummEngine::CHARSET_1() { continue; } + // Handle line overflow for V3. See also bug #1306269. + if (_game.version == 3 && _charset->_nextLeft >= _screenWidth) { + _charset->_nextLeft = _screenWidth; + } + // Handle line breaks for V1-V2 + if (_game.version <= 2 && _charset->_nextLeft >= _screenWidth) { + goto newLine; + } + _charset->_left = _charset->_nextLeft; _charset->_top = _charset->_nextTop; @@ -615,14 +624,6 @@ void ScummEngine::CHARSET_1() { } else { _talkDelay += (int)VAR(VAR_CHARINC); } - // Handle line overflow for V3 - if (_game.version == 3 && _charset->_nextLeft >= _screenWidth) { - _charset->_nextLeft = _screenWidth; - } - // Handle line breaks for V1-V2 - if (_game.version <= 2 && _charset->_nextLeft >= _screenWidth) { - goto newLine; - } } #ifndef DISABLE_SCUMM_7_8 |