[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.229.2.12,1.229.2.13

Travis Howell kirben at users.sourceforge.net
Sat Aug 14 18:28:02 CEST 2004


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

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

Fix Dig regression, small part of code was lost


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.229.2.12
retrieving revision 1.229.2.13
diff -u -d -r1.229.2.12 -r1.229.2.13
--- actor.cpp	14 Aug 2004 03:07:32 -0000	1.229.2.12
+++ actor.cpp	15 Aug 2004 01:27:23 -0000	1.229.2.13
@@ -1263,7 +1263,7 @@
 	act = getTalkingActor();
 	if (act && act < 0x80) {
 		Actor *a = derefActor(act, "stopTalk");
-		if (a->isInCurrentRoom()) {
+		if (a->isInCurrentRoom() || _version >= 7) {
 			if ((_version == 7 && !_string[0].no_talk_anim) || (_version <= 6 && _useTalkAnims)) {
 				a->runActorTalkScript(a->talkStopFrame);
 				_useTalkAnims = false;





More information about the Scummvm-git-logs mailing list