diff options
| author | Max Horn | 2004-08-05 20:14:43 +0000 |
|---|---|---|
| committer | Max Horn | 2004-08-05 20:14:43 +0000 |
| commit | 378491faf90470ce8daf746c9720594c053b36ee (patch) | |
| tree | bf2ce2d9100eca9d876135fa6478ea3e286f5221 /scumm/actor.cpp | |
| parent | a1480ba0689cd45c0c6b4a0dfd5e68de190b12a5 (diff) | |
| download | scummvm-rg350-378491faf90470ce8daf746c9720594c053b36ee.tar.gz scummvm-rg350-378491faf90470ce8daf746c9720594c053b36ee.tar.bz2 scummvm-rg350-378491faf90470ce8daf746c9720594c053b36ee.zip | |
Fix for bug #908434 (COMI: Using the ventriloquism book on Blondebeard acts weird)
svn-id: r14474
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index ca70e25444..83c33438b4 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1219,7 +1219,7 @@ void ScummEngine::actorTalk(const byte *msg) { if ((_version <= 7 && !_keepText) || (_version == 8 && VAR(VAR_HAVE_MSG))) stopTalk(); setTalkingActor(a->number); - if ((_version == 8) || (_version <= 7 && !_string[0].no_talk_anim)) { + if (!_string[0].no_talk_anim) { a->runActorTalkScript(a->talkStartFrame); _useTalkAnims = true; } @@ -1275,7 +1275,7 @@ void ScummEngine::stopTalk() { if (act && act < 0x80) { Actor *a = derefActor(act, "stopTalk"); if (a->isInCurrentRoom()) { - if (_version == 8 || (_version == 7 && !_string[0].no_talk_anim) || (_version <= 6 && _useTalkAnims)) { + if ((_version >= 7 && !_string[0].no_talk_anim) || (_version <= 6 && _useTalkAnims)) { a->runActorTalkScript(a->talkStopFrame); _useTalkAnims = false; } |