[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.63,1.64 descumm6.cpp,1.108,1.109

[Max Horn]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv28297

Modified Files:
	descumm.cpp descumm6.cpp 
Log Message:
added additional V6/V7 kernel subopcodes; made error message more consistent

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- descumm.cpp	24 May 2003 10:45:44 -0000	1.63
+++ descumm.cpp	28 May 2003 17:48:59 -0000	1.64
@@ -185,7 +185,7 @@
 	}
 
 	if (haltOnError && (s[0] == '?')) {
-		printf("%s out of range, was %d\n", s, i);
+		printf("ERROR: %s out of range, was %d\n", s, i);
 		exit(1);
 	}
 
@@ -549,7 +549,7 @@
 		ExprStack = (char **)malloc(sizeof(char *) * 256);
 
 	if (NumInExprStack >= 256) {
-		printf("Expression stack overflow!\n");
+		printf("ERROR: Expression stack overflow!\n");
 		exit(0);
 
 	}
@@ -1424,8 +1424,8 @@
 		break;
 	default:
 		/* Exit, this should never happen, only if my code is buggy */
-		printf("Unknown IF code %x", opcode);
-		exit(0);
+		printf("ERROR: Unknown IF code %x", opcode);
+		exit(1);
 	}
 
 	if (opcode == 0x28 || opcode == 0xA8) {
@@ -1458,7 +1458,7 @@
 			break;
 		default:
 			/* Exit, this should never happen, only if my code is buggy */
-			printf("Unknown IF code %x", opcode);
+			printf("ERROR: Unknown IF code %x", opcode);
 			exit(1);
 		}
 
@@ -1507,7 +1507,7 @@
 			break;
 		default:
 			/* Exit, this should never happen, only if my code is buggy */
-			printf("Unknown IF code %x", opcode);
+			printf("ERROR: Unknown IF code %x", opcode);
 			exit(1);
 		}
 	}
@@ -1567,8 +1567,8 @@
 		break;											/* increment & decrement */
 	default:
 		/* Exit, this should never happen, only if my code is buggy */
-		printf("Unknown VARSET code %x", opcode);
-		exit(0);
+		printf("ERROR: Unknown VARSET code %x", opcode);
+		exit(1);
 	}
 
 	buf = strecpy(buf, s);
@@ -2188,7 +2188,7 @@
 		break;
 
 	default:
-		printf("Unknown opcode %.2X\n", opcode);
+		printf("ERROR: Unknown opcode %.2X\n", opcode);
 		exit(1);
 	}
 }
@@ -2902,10 +2902,10 @@
 
 	default:
 		if (haltOnError) {
-			printf("Unknown opcode %.2X\n", opcode);
+			printf("ERROR: Unknown opcode %.2X\n", opcode);
 			exit(1);
 		}
-		sprintf(buf, "Unknown opcode %.2X!", opcode);
+		sprintf(buf, "ERROR: Unknown opcode %.2X!", opcode);
 	}
 }
 

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- descumm6.cpp	28 May 2003 13:44:07 -0000	1.108
+++ descumm6.cpp	28 May 2003 17:49:00 -0000	1.109
@@ -589,9 +589,9 @@
 void invalidop(const char *cmd, int op)
 {
 	if (cmd)
-		printf("Unknown opcode %s:0x%x (stack count %d)\n", cmd, op, num_stack);
+		printf("ERROR: Unknown opcode %s:0x%x (stack count %d)\n", cmd, op, num_stack);
 	else
-		printf("Unknown opcode 0x%x (stack count %d)\n", op, num_stack);
+		printf("ERROR: Unknown opcode 0x%x (stack count %d)\n", op, num_stack);
 	exit(1);
 }
 
@@ -795,7 +795,7 @@
 StackEnt *pop()
 {
 	if (num_stack == 0) {
-		printf("No items on stack to pop!\n");
+		printf("ERROR: No items on stack to pop!\n");
 
 		if (!haltOnError)
 			return se_complex("**** INVALID DATA ****");
@@ -953,7 +953,7 @@
 	int num, i;
 
 	if (senum->type != seInt) {
-		printf("stackList with variable number of arguments, cannot disassemble\n");
+		printf("ERROR: stackList with variable number of arguments, cannot disassemble\n");
 		exit(1);
 	}
 	se->data = num = senum->data;
@@ -1720,7 +1720,6 @@
 		ext("ry" "kernelGetFunctions\0"
 				"\x73|getWalkBoxAt,"
 				"\x74|isPointInBox,"
-
 				"\xCE|getRGBSlot,"
 				"\xD3|getKeyState,"
 				"\xD7|getBox,"
@@ -2414,7 +2413,8 @@
 		// TODO - add more subopcodes
 		ext("ry" "kernelGetFunctions\0"
 				"\x73|getWalkBoxAt,"
-				"\x74|isPointInBox"
+				"\x74|isPointInBox,"
+				"\xCE|getRGBSlot"
 				);
 		break;
 	case 0xC9:
@@ -2422,6 +2422,10 @@
 		ext("y" "kernelSetFunctions\0"
 				"\x4|grabCursor,"
 				"\x5|fadeOut,"
+				"\xC|setCursorImg,"
+				"\xD|remapCostume,"
+				"\xE|remapCostumeInsert,"
+				"\xF|setVideoFrameRate,"
 
 				"\x6C|buildPaletteShadow,"
 				"\x6D|setPaletteShadow,"