diff options
author | Travis Howell | 2010-12-28 06:05:57 +0000 |
---|---|---|
committer | Travis Howell | 2010-12-28 06:05:57 +0000 |
commit | ccb8a01b179a40847d670f1510bf715d99b96fbd (patch) | |
tree | 0a09842855b27d012d1cd3acb488528728e9020f /engines/scumm/actor.cpp | |
parent | cfbac503addad7af26a5d9f8795edfd229faefb0 (diff) | |
download | scummvm-rg350-ccb8a01b179a40847d670f1510bf715d99b96fbd.tar.gz scummvm-rg350-ccb8a01b179a40847d670f1510bf715d99b96fbd.tar.bz2 scummvm-rg350-ccb8a01b179a40847d670f1510bf715d99b96fbd.zip |
SCUMM: Correct fix for bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55053
Diffstat (limited to 'engines/scumm/actor.cpp')
-rw-r--r-- | engines/scumm/actor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index ca1dc8869f..5906545917 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -2037,7 +2037,7 @@ void ScummEngine_v7::actorTalk(const byte *msg) { _haveMsg = 1; if (_game.id == GID_FT) VAR(VAR_HAVE_MSG) = 0xFF; - _haveActorSpeechMsg = true; + _haveActorSpeechMsg = (_game.id == GID_FT) ? true : (!_sound->isSoundRunning(kTalkSoundID)); if (_game.id == GID_DIG || _game.id == GID_CMI) { stringWrap = _string[0].wrapping; _string[0].wrapping = true; |