[Scummvm-cvs-logs] CVS: tools descumm3.cpp,1.14,1.15

[Max Horn]

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

Modified Files:
	descumm3.cpp 
Log Message:
more Zak256 opcode fixes

Index: descumm3.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm3.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- descumm3.cpp	23 Nov 2002 21:27:10 -0000	1.14
+++ descumm3.cpp	23 Nov 2002 22:16:22 -0000	1.15
@@ -1407,7 +1407,7 @@
 	switch (opcode) {
 
 	case 0x00:
-		do_tok(buf, "stopObjectScript", 0);
+		do_tok(buf, "stopObjectCode", 0);
 		break;
 	case 0xA0:
 		do_tok(buf, "stopScript", 0);
@@ -1462,23 +1462,11 @@
 	case 0x65:
 	case 0x85:
 	case 0xA5:
-	case 0xE5:{
-
-			buf = do_tok(buf, "drawObject", ((opcode & 0x80) ? A1V : A1W) | ANOLASTPAREN);
-			opcode = get_byte();
-			switch (opcode & 0x1F) {
-			case 1:
-				do_tok(buf, ", setXY(",
-							 ANOLASTPAREN | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1W) |
-							 ((opcode & 0x40) ? A2V : A2W));
-				break;
-			case 2:
-				do_tok(buf, ", setImage(", ANOLASTPAREN | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1W));
-				break;
-			}
-			strcat(buf, "));");
-
-		}
+	case 0xE5:
+		buf = do_tok(buf, "drawObject",
+					 ((opcode & 0x80) ? A1V : A1W) |
+					 ((opcode & 0x40) ? A2V : A2W) |
+					 ((opcode & 0x20) ? A3V : A3W));
 		break;
 
 	case 0x06:
@@ -1799,13 +1787,7 @@
 
 	case 0x70:
 	case 0xF0:
-		byte opcode2;
-		buf = do_tok(buf, "lights", ((opcode & 0x80) ? A1V : A1W) | ANOLASTPAREN);
-		opcode = get_byte();
-		opcode2 = get_byte();
-		do_tok(buf, NULL,
-					 ASTARTCOMMA | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1B) |
-					 ((opcode2 & 0x80) ? A2V : A2B));
+		buf = do_tok(buf, "lights", ((opcode & 0x80) ? A1V : A1B) | A2B | A3B);
 		break;
 
 	case 0x3F: