[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.24,1.25

[Max Horn]

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

Modified Files:
	descumm6.cpp 
Log Message:
descumm V7 better; but script 151 still is not correctly disassmbled

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- descumm6.cpp	6 Dec 2002 17:17:04 -0000	1.24
+++ descumm6.cpp	8 Dec 2002 13:33:43 -0000	1.25
@@ -668,6 +668,10 @@
 
 		if (cmd == 'p') {
 			args[numArgs++] = pop();
+		} else if (cmd == 'z') {	// = popRoomAndObj()
+			args[numArgs++] = pop();
+			if (scriptVersion < 7)
+				args[numArgs++] = pop();
 		} else if (cmd == 's') {
 			args[numArgs++] = se_get_string();
 		} else if (cmd == 'w') {
@@ -1013,7 +1017,10 @@
 				"\x96|softUserputOn,"
 				"\x97|softUserputOff,"
 				"\x99pp|setCursorImg,"
-				"\x9App|setCursorHotspot," "\x9Cp|initCharset," "\x9Dl|charsetColors," "\xD6p|new_unk_1");
+				"\x9App|setCursorHotspot,"
+				"\x9Cp|initCharset,"
+				"\x9Dl|charsetColors,"
+				"\xD6p|makeCursorColorTransparent");
 		break;
 	case 0x6C:
 		ext("|break");
@@ -1052,13 +1059,19 @@
 		ext("p|stopObjectScript");
 		break;
 	case 0x78:
-		ext("p|panCameraTo");
+		if (scriptVersion < 7)
+			ext("p|panCameraTo");
+		else
+			ext("pp|panCameraTo");
 		break;
 	case 0x79:
 		ext("p|actorFollowCamera");
 		break;
 	case 0x7A:
-		ext("p|setCameraAt");
+		if (scriptVersion < 7)
+			ext("p|setCameraAt");
+		else
+			ext("pp|setCameraAt");
 		break;
 	case 0x7B:
 		ext("p|loadRoom");
@@ -1076,7 +1089,7 @@
 		ext("pppp|putActorInRoom");
 		break;
 	case 0x80:
-		ext("ppp|putActorAtObject");
+		ext("zp|putActorAtObject");
 		break;
 	case 0x81:
 		ext("pp|faceActor");
@@ -1088,13 +1101,10 @@
 		ext("pppp|doSentence");
 		break;
 	case 0x84:
-		if (scriptVersion < 7)
-			ext("pp|pickupObject");
-		else
-			ext("p|pickupObject");
+		ext("z|pickupObject");
 		break;
 	case 0x85:
-		ext("pppp|loadRoomWithEgo");
+		ext("ppzp|loadRoomWithEgo");
 		break;
 	case 0x87:
 		ext("rp|getRandomNumber");
@@ -1154,18 +1164,11 @@
 		ext("|createBoxMatrix");
 		break;
 	case 0x9B:
-		if (scriptVersion < 7)
-			ext("x" "resourceRoutines\0" "\x64p|loadScript," "\x65p|loadSound," "\x66p|loadCostume," 
-				"\x67p|loadRoom," "\x68p|nukeScript," "\x69p|nukeSound," "\x6Ap|nukeCostume,"
-				"\x6Bp|nukeRoom," "\x6Cp|lockScript," "\x6Dp|lockSound," "\x6Ep|lockCostume,"
- 				"\x6Fp|lockRoom," "\x70p|unlockScript," "\x71p|unlockSound," "\x72p|unlockCostume,"
-				"\x73p|unlockRoom," "\x75p|loadCharset," "\x76p|nukeCharset," "\x77pp|unkResProc");
-		else
-			ext("x" "resourceRoutines\0" "\x64p|loadScript," "\x65p|loadSound," "\x66p|loadCostume," 
-				"\x67p|loadRoom," "\x68p|nukeScript," "\x69p|nukeSound," "\x6Ap|nukeCostume,"
-				"\x6Bp|nukeRoom," "\x6Cp|lockScript," "\x6Dp|lockSound," "\x6Ep|lockCostume,"
- 				"\x6Fp|lockRoom," "\x70p|unlockScript," "\x71p|unlockSound," "\x72p|unlockCostume,"
-				"\x73p|unlockRoom," "\x75p|loadCharset," "\x76p|nukeCharset," "\x77p|unkResProc");
+		ext("x" "resourceRoutines\0" "\x64p|loadScript," "\x65p|loadSound," "\x66p|loadCostume," 
+			"\x67p|loadRoom," "\x68p|nukeScript," "\x69p|nukeSound," "\x6Ap|nukeCostume,"
+			"\x6Bp|nukeRoom," "\x6Cp|lockScript," "\x6Dp|lockSound," "\x6Ep|lockCostume,"
+			"\x6Fp|lockRoom," "\x70p|unlockScript," "\x71p|unlockSound," "\x72p|unlockCostume,"
+			"\x73p|unlockRoom," "\x75p|loadCharset," "\x76p|nukeCharset," "\x77z|loadFlObject");
 		break;
 	case 0x9C:
 		ext("x" "roomOps\0"
@@ -1179,7 +1182,9 @@
 				"\xB5p|screenEffect,"
 				"\xB6ppppp|unkRoomFunc2,"
 				"\xB7ppppp|unkRoomFunc3,"
-				"\xBApppp|palManipulate," "\xBBpp|colorCycleDelay," "\xD5p|setPalette");
+				"\xBApppp|palManipulate,"
+				"\xBBpp|colorCycleDelay,"
+				"\xD5p|setPalette");
 		break;
 	case 0x9D:
 		ext("x" "actorSet\0"