[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.80,2.81 boxes.cpp,1.4,1.5

[Max Horn]

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

Modified Files:
	script_v8.cpp boxes.cpp 
Log Message:
added two V8 opcodes; more meaningful error message

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.80
retrieving revision 2.81
diff -u -d -r2.80 -r2.81
--- script_v8.cpp	30 Dec 2002 01:17:08 -0000	2.80
+++ script_v8.cpp	30 Dec 2002 01:40:11 -0000	2.81
@@ -572,7 +572,7 @@
 		error("decodeParseString: SO_PRINT_MUMBLE");
 		break;
 	default:
-		error("decodeParseString: default case");
+		error("decodeParseString: default case %d", b);
 	}
 }
 
@@ -1385,12 +1385,6 @@
 	case 109:	// setPaletteShadow
 		setupShadowPalette(0, args[1], args[2], args[3], args[4], args[5]);
 		break;
-	case 115:	// getWalkBoxAt
-		warning("o6_kernelSetFunctions: getWalkBoxAt (len = %d)", len);
-		break;
-	case 116:	// isPointInBox
-		warning("o6_kernelSetFunctions: isPointInBox (len = %d)", len);
-		break;
 	case 118:	// blastShadowObject
 		enqueueObject(args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], 3);
 		break;
@@ -1399,7 +1393,7 @@
 		break;
 
 	default:
-		warning("o6_kernelSetFunctions: default case (len = %d)", len);
+		warning("o6_kernelSetFunctions: default case %d (len = %d)", args[0], len);
 	}
 }
 
@@ -1410,6 +1404,12 @@
 	int len = getStackList(args, sizeof(args) / sizeof(args[0]));
 
 	switch (args[0]) {
+	case 0x73:	// getWalkBoxAt
+		push(getSpecialBox(args[1], args[2]));
+		break;
+	case 0x74:	// isPointInBox
+		push(checkXYInBoxBounds(args[3], args[1], args[2]));
+		break;
 	case 0xCE:		// getRGBSlot
 	case 0xD3:		// getKeyState
 	case 0xD7:		// getBox
@@ -1453,7 +1453,7 @@
 		}
 		break;
 	default:
-		error("o6_kernelGetFunctions: default case (len = %d)", len);
+		error("o6_kernelGetFunctions: default case %d (len = %d)", args[0], len);
 	}
 
 }

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- boxes.cpp	30 Dec 2002 01:17:41 -0000	1.4
+++ boxes.cpp	30 Dec 2002 01:40:12 -0000	1.5
@@ -169,7 +169,7 @@
 		return (Box *)(ptr + box * SIZEOF_BOX + 2);
 }
 
-int Scumm::getSpecialBox(int param1, int param2)
+int Scumm::getSpecialBox(int x, int y)
 {
 	int i;
 	int numOfBoxes;
@@ -183,7 +183,7 @@
 		if (!(flag & kBoxInvisible) && (flag & kBoxPlayerOnly))
 			return (-1);
 
-		if (checkXYInBoxBounds(i, param1, param2))
+		if (checkXYInBoxBounds(i, x, y))
 			return (i);
 	}