diff options
| author | Max Horn | 2006-05-06 22:49:57 +0000 |
|---|---|---|
| committer | Max Horn | 2006-05-06 22:49:57 +0000 |
| commit | 3e0cb0dfd0821a8ff9881e5fe572c8a893fd04cc (patch) | |
| tree | 885b9e6a2e86908807b1bce7025b69949cc8bdd3 /engines/scumm/string.cpp | |
| parent | ae50315fa05598e83699b87e797c88a57858962e (diff) | |
| download | scummvm-rg350-3e0cb0dfd0821a8ff9881e5fe572c8a893fd04cc.tar.gz scummvm-rg350-3e0cb0dfd0821a8ff9881e5fe572c8a893fd04cc.tar.bz2 scummvm-rg350-3e0cb0dfd0821a8ff9881e5fe572c8a893fd04cc.zip | |
Fix for bug #1449597 (MANIAC: Incorrect word wrapping)
svn-id: r22371
Diffstat (limited to 'engines/scumm/string.cpp')
| -rw-r--r-- | engines/scumm/string.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 62e1ed6829..bd92416a3a 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -420,6 +420,7 @@ void ScummEngine::CHARSET_1() { return; if (_game.version >= 4 && _game.version <= 6) { + // Do nothing while the camera is moving if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x) return; } @@ -480,7 +481,10 @@ void ScummEngine::CHARSET_1() { if (_talkDelay) return; - if ((_game.version <= 6 && _haveMsg == 1) || (_game.version == 7 && _haveMsg != 1) || (_game.version == 8 && VAR(VAR_HAVE_MSG))) { + if ((_game.version <= 6 && _haveMsg == 1) || + (_game.version == 7 && _haveMsg != 1) || + (_game.version == 8 && VAR(VAR_HAVE_MSG))) { + if (_game.heversion >= 60) { if (_sound->isSoundRunning(1) == 0) stopTalk(); @@ -612,11 +616,11 @@ void ScummEngine::CHARSET_1() { _talkDelay += (int)VAR(VAR_CHARINC); } // Handle line overflow for V3 - if (_game.version == 3 && _charset->_nextLeft > _screenWidth) { + if (_game.version == 3 && _charset->_nextLeft >= _screenWidth) { _charset->_nextLeft = _screenWidth; } // Handle line breaks for V1-V2 - if (_game.version <= 2 && _charset->_nextLeft > _screenWidth) { + if (_game.version <= 2 && _charset->_nextLeft >= _screenWidth) { goto newLine; } } |