[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.154,1.155 script_v6.cpp,1.449,1.450

[Gregory Montoir]

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

Modified Files:
	debugger.cpp script_v6.cpp 
Log Message:
workaround bug #1223621

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- debugger.cpp	6 Aug 2005 14:34:39 -0000	1.154
+++ debugger.cpp	2 Sep 2005 10:49:21 -0000	1.155
@@ -387,10 +387,11 @@
 		value2 = atoi(argv[4]);
 
 	if (!strcmp(argv[2], "animvar")) {
-
 		a->setAnimVar(value, value2);
 		DebugPrintf("Actor[%d].animVar[%d] = %d\n", actnum, value, a->getAnimVar(value));
-
+	} else if (!strcmp(argv[2], "anim")) {
+		a->animateActor(value);
+		DebugPrintf("Actor[%d].animateActor(%d)\n", actnum, value);
 	} else if (!strcmp(argv[2], "ignoreboxes")) {
 		a->_ignoreBoxes = (value > 0);
 		DebugPrintf("Actor[%d].ignoreBoxes = %d\n", actnum, a->_ignoreBoxes);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- script_v6.cpp	14 Aug 2005 01:41:52 -0000	1.449
+++ script_v6.cpp	2 Sep 2005 10:49:21 -0000	1.450
@@ -1271,6 +1271,15 @@
 		// (593 is the time machine in room 57), or if this is simply a script bug.
 		act = 6;
 	}
+	if (_gameId == GID_SAMNMAX && _roomResource == 35 &&
+		vm.slot[_currentScript].number == 202 && act == 4 && anim == 14) {
+		// WORKAROUND bug #1223621 (Animation glitch at World of Fish).
+		// Before starting animation 14 of the fisherman, make sure he isn't
+		// talking anymore. This appears to be a bug in the original game as well.
+		if (getTalkingActor() == 4) {
+			stopTalk();
+		}
+	}
 	Actor *a = derefActor(act, "o6_animateActor");
 	a->animateActor(anim);
 }