[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.229.2.10,1.229.2.11

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29388/scumm

Modified Files:
      Tag: branch-0-6-0
	actor.cpp 
Log Message:

Back port:
Fix for bug #908434 (COMI: Using the ventriloquism book on Blondebeard acts weird)


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.229.2.10
retrieving revision 1.229.2.11
diff -u -d -r1.229.2.10 -r1.229.2.11
--- actor.cpp	18 Jul 2004 22:15:51 -0000	1.229.2.10
+++ actor.cpp	13 Aug 2004 02:48:41 -0000	1.229.2.11
@@ -1190,7 +1190,7 @@
 			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;
 			}
@@ -1246,7 +1246,7 @@
 	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;
 			}