[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.128,1.129

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21939

Modified Files:
	script_v6.cpp 
Log Message:
corrected FIXME

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- script_v6.cpp	24 May 2003 16:09:29 -0000	1.128
+++ script_v6.cpp	24 May 2003 16:45:49 -0000	1.129
@@ -1006,10 +1006,8 @@
 		a2 = derefActorSafe(obj, "o6_walkActorToObj(2)");
 		if (a2 == 0) {
 			// FIXME: This is a hack to work around bug #742676 SAM: Fish Farm.
-			// However, that this ever happens seems to be due to a bug in
-			// ScummVM, esp. since even with this hack the behaviour of Sam
-			// is not correct (when using the fish he says "This is a completely
-			// unusable thingamabob", but should say "Wow, he's blowing bubbles".
+			// Note quite sure why it happens, though, if it's normal or due to
+			// a bug in the ScummVM code.
 			warning("o6_walkActorToObj: invalid actor %d\n", obj);
 			return;
 		}
@@ -1094,7 +1092,7 @@
 
 	objectB = pop();
 	if (!(_features & GF_AFTER_V8))
-		dummy = pop();	// dummy pop
+		dummy = pop();	// dummy pop (in Sam&Max, seems to be always 0 or 130)
 	objectA = pop();
 	verb = pop();