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

[Max Horn]

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

Modified Files:
	descumm3.cpp descumm5.cpp 
Log Message:
updated some opcode names to match between 3 and 5; some other corrections

Index: descumm3.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm3.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- descumm3.cpp	13 Aug 2002 23:49:27 -0000	1.7
+++ descumm3.cpp	24 Aug 2002 12:00:28 -0000	1.8
@@ -1410,7 +1410,7 @@
 
 	case 0x03:
 	case 0x83:
-		do_tok(buf, "GetActorLocation", AVARSTORE | ((opcode & 0x80) ? A1V : A1B));
+		do_tok(buf, "getActorRoom", AVARSTORE | ((opcode & 0x80) ? A1V : A1B));
 		break;
 
 
@@ -1746,7 +1746,9 @@
 	case 0x20:
 		do_tok(buf, "stopMusic", 0);
 		break;
+
 	case 0x70:
+	case 0xF0:
 		byte opcode2;
 		buf = do_tok(buf, "lights", ((opcode & 0x80) ? A1V : A1W) | ANOLASTPAREN);
 		opcode = get_byte();
@@ -1755,6 +1757,7 @@
 					 ASTARTCOMMA | ANOFIRSTPAREN | ((opcode & 0x80) ? A1V : A1B) |
 					 ((opcode2 & 0x80) ? A2V : A2B));
 		break;
+
 	case 0x3F:
 	case 0x7F:
 	case 0xBF:
@@ -1808,7 +1811,7 @@
 
 	case 0x52:
 	case 0xD2:
-		do_tok(buf, "CameraFollowActor", ((opcode & 0x80) ? A1V : A1B));
+		do_tok(buf, "actorFollowCamera", ((opcode & 0x80) ? A1V : A1B));
 		break;
 
 	case 0x58:
@@ -1911,7 +1914,7 @@
 		break;
 
 	case 0x2B:
-		do_tok(buf, "DelayJiffies", A1V);
+		do_tok(buf, "delayVariable", A1V);
 		break;
 
 	case 0x0E:
@@ -1961,7 +1964,7 @@
 	case 0x7d:
 	case 0xBD:
 	case 0xFD:
-		do_tok(buf, "GetInventoryItem",
+		do_tok(buf, "findInventory",
 					 AVARSTORE | ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 
@@ -1989,7 +1992,7 @@
 
 	case 0x60:
 	case 0xE0:
-		do_tok(buf, "FreezeScripts", ((opcode & 0x80) ? A1V : A1B));
+		do_tok(buf, "freezeScripts", ((opcode & 0x80) ? A1V : A1B));
 		break;
 	case 0xFC:
 		do_tok(buf, "isSoundRunning", AVARSTORE | ((opcode & 0x80) ? A1V : A1B));

Index: descumm5.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm5.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- descumm5.cpp	13 Aug 2002 23:49:27 -0000	1.7
+++ descumm5.cpp	24 Aug 2002 12:00:28 -0000	1.8
@@ -64,7 +64,7 @@
 #define ANOFIRSTPAREN (1<<29)
 #define ASTARTCOMMA (1<<28)
 #define AVARSTORE (1<<27)
-
+#define MKID(a) (((a&0xff) << 8) | ((a >> 8)&0xff))
 
 #define uchar unsigned char
 #define uint unsigned int
@@ -2119,11 +2119,7 @@
 
 	buf = (char *)malloc(4096);
 
-#if defined(SCUMM_BIG_ENDIAN)
 	switch (TO_LE_32(*((long *)mem))) {
-#else
-	switch (*((long *)mem)) {
-#endif
 	case 'RCSL':
 		printf("Script# %d\n", (unsigned char)mem[8]);
 		mem += 9;