[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.46,1.47

James Brown ender at users.sourceforge.net
Sat Nov 2 04:44:51 CET 2002


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

Modified Files:
	script_v2.cpp 
Log Message:
Fix some really stupid code someone added - this basically fixes the FT derby, except for keyboard control


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- script_v2.cpp	2 Nov 2002 11:51:44 -0000	1.46
+++ script_v2.cpp	2 Nov 2002 12:39:42 -0000	1.47
@@ -3033,7 +3033,7 @@
 	Actor *a;
 
 	getStackList(args, sizeof(args) / sizeof(args[0]));
-
+	printf("kernel(%d)\n", args[0]);
 	switch (args[0]) {
 	case 113:
 		// This is used for the Sam & Max paint-by-numbers mini-game
@@ -3057,19 +3057,19 @@
 		push(remapPaletteColor(args[1], args[2], args[3], (uint) - 1));
 		break;
 	case 207:
-		i = getObjectIndex(pop());
+		i = getObjectIndex(args[1]);
 		push(_objs[i].x_pos);
 		break;
 	case 208:
-		i = getObjectIndex(pop());
+		i = getObjectIndex(args[1]);
 		push(_objs[i].y_pos);
 		break;
 	case 209:
-		i = getObjectIndex(pop());
+		i = getObjectIndex(args[1]);
 		push(_objs[i].width);
 		break;
 	case 210:
-		i = getObjectIndex(pop());
+		i = getObjectIndex(args[1]);
 		push(_objs[i].height);
 		break;
 	case 211:
@@ -3091,7 +3091,7 @@
 			break;
 		}
 
-		warning("o6_kernelFunction: getInput(%d)", args[1]);
+		warning("o6_kernelFunction: getInput(%d) against %d", args[1], _lastKeyHit);
 		push(0);
 		break;
 	case 212:





More information about the Scummvm-git-logs mailing list