diff options
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index a580c481a8..13bcc43010 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -143,7 +143,7 @@ void ScummEngine::CHARSET_1() { if (_talkDelay) return; - if (_haveMsg == 1) { + if ((_version <= 7 && _haveMsg == 1) || (_version == 8 && VAR(VAR_HAVE_MSG))) { if ((_sound->_sfxMode & 2) == 0) stopTalk(); return; @@ -307,6 +307,10 @@ void ScummEngine::CHARSET_1() { _charsetBufPos = buffer - _charsetBuffer; + // TODO Verify this is correct spot + if (_version == 8) + VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1; + // FIXME: Remove this and the next two lines eventually! if (_charset->_hasMask != (_charset->_str.left != -1)) warning("_hasMask mismatch (case A %d) - please report to Fingolfin if you notice any text/graphics glitches related to this!", _charset->_hasMask); |