[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.83,1.84 descumm6.cpp,1.120,1.121

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Nov 10 00:27:03 CET 2003


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

Modified Files:
	descumm.cpp descumm6.cpp 
Log Message:
changed opcodes names

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- descumm.cpp	9 Nov 2003 13:23:40 -0000	1.83
+++ descumm.cpp	10 Nov 2003 08:25:58 -0000	1.84
@@ -496,14 +496,14 @@
 
 }
 
-void do_actorset(char *buf, byte opcode)
+void do_actorops(char *buf, byte opcode)
 {
 	static const byte convertTable[20] =
 		{ 1, 0, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 20 };
 
 	char first = 1;
 
-	buf = do_tok(buf, "ActorSet", ((opcode & 0x80) ? A1V : A1B) | ANOLASTPAREN);
+	buf = do_tok(buf, "ActorOps", ((opcode & 0x80) ? A1V : A1B) | ANOLASTPAREN);
 
 	buf = strecpy(buf, ",[");
 
@@ -2660,7 +2660,7 @@
 	case 0x53:
 	case 0x93:
 	case 0xD3:
-		do_actorset(buf, opcode);
+		do_actorops(buf, opcode);
 		break;
 
 	case 0x20:

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- descumm6.cpp	11 Oct 2003 18:23:38 -0000	1.120
+++ descumm6.cpp	10 Nov 2003 08:25:58 -0000	1.121
@@ -1220,7 +1220,7 @@
 		break;
 	case 0x70:
 		// FIXME - is this correct?!? Also, make the display nicer...
-		ext("x" "dim\0"
+		ext("x" "dimArray\0"
 				"\x0Apw|dim-scummvar,"
 				"\x0Bpw|dim-string,"
 				"\xCAw|undim"
@@ -1233,7 +1233,7 @@
 
 	case 0x74:
 		// FIXME - is this correct?!? Also, make the display nicer...
-		ext("x" "dim2\0"
+		ext("x" "dim2dimArray\0"
 				"\x0Appw|dim2-scummvar,"
 				"\x0Bppw|dim2-string,"
 				"\xCAw|undim2"
@@ -1265,10 +1265,10 @@
 		break;
 
 	case 0x79:
-		ext("lpp|startScriptEx");
+		ext("lpp|startScript");
 		break;
 	case 0x7A:
-		ext("lp|startScript");
+		ext("lp|startScriptQuick");
 		break;
 	case 0x7B:
 		ext("|stopObjectCode");
@@ -1283,7 +1283,7 @@
 		ext("p|return");
 		break;
 	case 0x7F:
-		ext("lppp|startObjectEx");
+		ext("lppp|startObject");
 		break;
 
 	case 0x81:
@@ -1382,7 +1382,7 @@
 		ext("ppp|walkActorTo");
 		break;
 	case 0xA1:
-		ext("pppp|putActorInRoom");
+		ext("pppp|putActorAtXY");
 		break;
 	case 0xA2:
 		ext("zp|putActorAtObject");
@@ -1581,7 +1581,7 @@
 		break;
 
 	case 0xC8:
-		ext("rlp|startScriptQuick");
+		ext("rlp|startScriptQuick2");
 		break;
 	case 0xC9:
 		ext("lppp|startObjectQuick");
@@ -1863,19 +1863,19 @@
 		jumpif(pop(), false);
 		break;
 	case 0x5E:
-		ext("lpp|startScriptEx");
+		ext("lpp|startScript");
 		break;
 	case 0x5F:
-		ext("lp|startScript");
+		ext("lp|startScriptQuick");
 		break;
 	case 0x60:
 		ext("lppp|startObject");
 		break;
 	case 0x61:
-		ext("pp|setObjectState");
+		ext("pp|drawObject");
 		break;
 	case 0x62:
-		ext("ppp|setObjectXY");
+		ext("ppp|drawObjectAt");
 		break;
 		/* *** */
 	case 0x65:
@@ -1980,7 +1980,7 @@
 		ext("ppp|walkActorTo");
 		break;
 	case 0x7F:
-		ext("pppp|putActorInRoom");
+		ext("pppp|putActorInXY");
 		break;
 	case 0x80:
 		ext("zp|putActorAtObject");
@@ -2257,7 +2257,7 @@
 		ext("s|talkEgo");
 		break;
 	case 0xBC:
-		ext("x" "dim\0"
+		ext("x" "dimArray\0"
 				"\xC7pw|dimType5,"
 				"\xC8pw|dimType1,"
 				"\xC9pw|dimType2,"
@@ -2269,10 +2269,10 @@
 		ext("lpp|startObjectQuick");
 		break;
 	case 0xBF:
-		ext("lp|startScriptQuick");
+		ext("lp|startScriptQuick2");
 		break;
 	case 0xC0:
-		ext("x" "dim2\0"
+		ext("x" "dim2dimArray\0"
 				"\xC7ppw|dim2Type5,"
 				"\xC8ppw|dim2Type1,"
 				"\xC9ppw|dim2Type2,"





More information about the Scummvm-git-logs mailing list