From 378491faf90470ce8daf746c9720594c053b36ee Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 Aug 2004 20:14:43 +0000
Subject: Fix for bug #908434 (COMI: Using the ventriloquism book on
 Blondebeard acts weird)

svn-id: r14474
---
 scumm/actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scumm')

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;
 			}
-- 
cgit v1.2.3