[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.20,1.21 script_v2.cpp,1.38,1.39

James Brown ender at users.sourceforge.net
Sun Oct 20 09:50:03 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv11318/scumm

Modified Files:
	actor.cpp script_v2.cpp 
Log Message:
Fix an infinite talking loop in The Dig. Again. :)


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- actor.cpp	20 Oct 2002 13:16:12 -0000	1.20
+++ actor.cpp	20 Oct 2002 16:49:30 -0000	1.21
@@ -782,7 +782,7 @@
 	act = _vars[VAR_TALK_ACTOR];
 	if (act && act < 0x80) {
 		Actor *a = derefActorSafe(act, "stopTalk");
-		if ((a->isInCurrentRoom() || (_features & GF_AFTER_V7)) && _useTalkAnims) {
+		if ((a->isInCurrentRoom() && _useTalkAnims) || (_features & GF_AFTER_V7)) {
 			a->startAnimActor(a->talkFrame2);
 			_useTalkAnims = false;
 		}

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- script_v2.cpp	20 Oct 2002 16:25:43 -0000	1.38
+++ script_v2.cpp	20 Oct 2002 16:49:30 -0000	1.39
@@ -3204,7 +3204,6 @@
 					_mixer->stop(_sound->_talkChannel);
 
 				_sound->_talkChannel = _sound->playBundleSound(pointer);
-				printf("Talkchannel for %s is %d\n", transText, _sound->_talkChannel);
 				_messagePtr = (byte*)&transText;
 
 				switch (m) {





More information about the Scummvm-git-logs mailing list