[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.258,2.259

[Travis Howell]

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

Modified Files:
	script_v8.cpp 
Log Message:

Remove old hack and comment


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.258
retrieving revision 2.259
diff -u -d -r2.258 -r2.259
--- script_v8.cpp	11 Jul 2004 11:59:18 -0000	2.258
+++ script_v8.cpp	16 Jul 2004 10:17:41 -0000	2.259
@@ -1292,15 +1292,10 @@
 //		warning("o8_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
 		break;
 	case 23:	// setActorChoreLimbFrame
-		// FIXME: This still isn't quite working correctly. See bug #754419
-		// This opcode is used a lot in script 28.
-
-//		warning("o8_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
 		a = derefActor(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame");
 
 		a->startAnimActor(args[2]);
 		a->animateLimb(args[3], args[4]);
-		
 		break;
 	case 24:	// clearTextQueue
 		// TODO - clearTextQueue. Maybe this should just call removeBlastTexts() ?
@@ -1486,15 +1481,6 @@
 void ScummEngine_v8::o8_getActorChore() {
 	int actnum = pop();
 	Actor *a = derefActor(actnum, "o8_getActorChore");
-
-	// FIXME: This is a hack for the cannon scene, as something isn't quite right
-	// here yet..
-	if ((_roomResource == 10) && (vm.slot[_currentScript].number == 2021)) {
-		//warning("o8_getActorChore() hack: would have returned %d", a->frame);
-		push(11);
-		return;
-	}
-
 	push(a->frame);
 }