[Scummvm-cvs-logs] CVS: tools descumm3.cpp,1.8,1.9

Max Horn fingolfin at users.sourceforge.net
Sat Aug 24 06:56:01 CEST 2002


Update of /cvsroot/scummvm/tools
In directory usw-pr-cvs1:/tmp/cvs-serv16325

Modified Files:
	descumm3.cpp 
Log Message:
some more opcode corrections

Index: descumm3.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm3.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- descumm3.cpp	24 Aug 2002 12:00:28 -0000	1.8
+++ descumm3.cpp	24 Aug 2002 13:55:12 -0000	1.9
@@ -1514,8 +1514,19 @@
 		break;											/* arg1=actor, arg2=actor */
 
 	case 0x0F:
+	case 0x4F:
 	case 0x8F:
-		do_tok(buf, "getObjectState", AVARSTORE | ((opcode & 0x80) ? A1V : A1W));
+	case 0xCF:
+		do_tok(buf, "if State",
+					 ATO | ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
+		break;
+
+	case 0x2F:
+	case 0x6F:
+	case 0xAF:
+	case 0xEF:
+		do_tok(buf, "if not State",
+					 ATO | ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 
 
@@ -1609,6 +1620,11 @@
 		do_tok(buf, "getActorFacing", AVARSTORE | ((opcode & 0x80) ? A1V : A1B));
 		break;
 
+	case 0x66:
+	case 0xE6:
+		do_tok(buf, "getClosestObjActor", AVARSTORE | ((opcode & 0x80) ? A1V : A1B));
+		break;
+
 	case 0x6C:
 	case 0xEC:
 		do_tok(buf, "getActorWidth", AVARSTORE | ((opcode & 0x80) ? A1V : A1B));
@@ -2017,16 +2033,10 @@
 		do_tok(buf, "pickupObject", ((opcode & 0x80) ? A1V : A1W));
 		break;
 
-	case 0x2f:
 	case 0x45:
-	case 0x4F:
 //    case 0x5C:
-	case 0x6F:
-	case 0xAF:
 	case 0xC5:
-	case 0xCF:
 	case 0xDC:
-	case 0xEF:
 		if (HaltOnError) {
 			printf("Illegal opcode %.2X\n", opcode);
 			exit(1);





More information about the Scummvm-git-logs mailing list