[Scummvm-cvs-logs] CVS: tools descumm5.cpp,1.5,1.6

[Max Horn]

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

Modified Files:
	descumm5.cpp 
Log Message:
changed some opcodes to match the ScummVM names; some stuff to keep this in sync with descumm3

Index: descumm5.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm5.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- descumm5.cpp	27 Jul 2002 12:29:15 -0000	1.5
+++ descumm5.cpp	28 Jul 2002 10:15:19 -0000	1.6
@@ -123,6 +123,11 @@
 	return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
 }
 
+#else
+
+#define TO_LE_16(x) (x)
+#define TO_LE_32(x) (x)
+
 #endif
 
 int get_byte()
@@ -132,11 +137,7 @@
 
 int get_word()
 {
-#if defined(SCUMM_BIG_ENDIAN)
 	int i = TO_LE_16(*((short *)cur_pos));
-#else
-	int i = *((short *)cur_pos);
-#endif
 	cur_pos += 2;
 	return i;
 }
@@ -886,7 +887,7 @@
 	strcpy(buf, ")");
 }
 
-void do_33(char *buf)
+void do_room_ops(char *buf)
 {
 	int opcode = get_byte();
 
@@ -1358,16 +1359,16 @@
 
 	switch (opcode & 0x1F) {
 	case 0x1:
-		do_tok(buf, "SetBoxTo", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
+		do_tok(buf, "setBoxFlags", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 	case 0x2:
-		do_tok(buf, "SetBoxScale", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
+		do_tok(buf, "setBoxScale", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 	case 0x3:
 		do_tok(buf, "SetBoxSlot", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 	case 0x4:
-		do_tok(buf, "SetBoxPath", 0);
+		do_tok(buf, "createBoxMatrix", 0);
 		break;
 	default:
 		sprintf(buf, "SetBoxUnknown%.2X", opcode);
@@ -1767,7 +1768,10 @@
 		break;
 
 	case 0x33:
-		do_33(buf);
+	case 0x73:
+	case 0xB3:
+	case 0xF3:
+		do_room_ops(buf);
 		break;
 
 	case 0x68:
@@ -1916,6 +1920,7 @@
 		break;
 
 	case 0x30:
+	case 0xB0:
 		do_matrix_ops(buf, opcode);
 		break;