[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.59,1.60

Max Horn fingolfin at users.sourceforge.net
Tue Dec 24 16:02:02 CET 2002


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

Modified Files:
	descumm6.cpp 
Log Message:
7 more scripts

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- descumm6.cpp	24 Dec 2002 16:48:26 -0000	1.59
+++ descumm6.cpp	25 Dec 2002 00:01:48 -0000	1.60
@@ -36,11 +36,11 @@
 typedef unsigned char byte;
 typedef unsigned char uint8;
 typedef unsigned short uint16;
-typedef unsigned long uint32;
+typedef unsigned int uint32;
 typedef unsigned int uint;
 typedef signed char int8;
 typedef signed short int16;
-typedef signed long int32;
+typedef signed int int32;
 
 int g_jump_opcode = 0x66;
 
@@ -1447,9 +1447,33 @@
 		ext("lppp|startObject");
 		break;
 
+	case 0x81:
+		ext("l|beginCutscene");
+		break;
+	case 0x82:
+		ext("|endCutscene");
+		break;
+	case 0x83:
+		ext("p|freezeUnfreeze");
+		break;
+
+	case 0x86:
+		ext("|stopSentence");
+		break;
+
 	case 0x89:
 		ext("lp|setClassOf?");
 		break;
+	case 0x8A:
+		ext("pp|setState");
+		break;
+	case 0x8B:
+		ext("pp|setOwner");
+		break;
+
+	case 0x8D:
+		ext("p|actorFollowCamera");
+		break;
 
 	case 0x93:
 		ext("m" "printLine_\0"
@@ -1515,6 +1539,22 @@
 				"\xD2|wrap"
 				);
 		break;
+	case 0x97:
+		ext("m" "blastText_\0"
+				"x" "blastText\0"
+				"\xC8|baseop,"
+				"\xC9|end,"
+				"\xCApp|XY,"
+				"\xCBp|color,"
+				"\xCC|center,"
+				"\xCD|charset,"	// ???
+				"\xCE|left,"
+				"\xCF|overhead,"
+				"\xD0|mumble,"
+				"\xD1s|msg,"
+				"\xD2|wrap"
+				);
+		break;
 
 	case 0x9C:
 		ext("x" "cursorCommand\0"
@@ -1673,6 +1713,9 @@
 				"\xA7p|verbSetLineSpacing"
 				);
 		break;
+	case 0xAF:
+		ext("p|startSound");
+		break;
 
 	case 0xB1:
 		ext("p|stopSound");
@@ -1694,14 +1737,30 @@
 				"\xE|remapCostumeInsert,"
 				"\xF|setVideoFrameRate,"
 
+				"\x14|setBoxSlot,"
+				"\x15|setScaleSlot,"
 				"\x16|setBannerColors,"
-
+				"\x17|setActorChoreLimbFrame,"
+				"\x18|clearTextQueue,"
+				"\x19|saveGameWrite,"
+				"\x1A|saveGameRead,"
+				"\x1B|saveGameReadName,"
+				"\x1C|saveGameStampScreenshot,"
 				"\x1D|setKeyScript,"
 				"\x1E|killAllScriptsButMe,"
 				"\x1F|stopAllVideo,"
 				"\x20|writeRegistryValue,"
+				"\x21|PpaletteSetIntensity,"
+				"\x22|queryQuit,"
 				
-				"\x6C|buildPaletteShadow"
+				"\x6C|buildPaletteShadow,"
+				"\x6D|setPaletteShadow,"
+
+				"\x73|getWalkBoxAt,"
+				"\x74|isPointInBox,"
+
+				"\x76|blastShadowObject,"
+				"\x77|superBlastObject"
 				);
 		break;
 
@@ -1748,6 +1807,12 @@
 		ext("rpp|findObject");
 		break;
 
+	case 0xDF:
+		ext("rpp|findInventory");
+		break;
+	case 0xE0:
+		ext("rp|getInventoryCount");
+		break;
 	case 0xE1:
 		ext("rpp|getAnimateVariable");
 		break;
@@ -1785,6 +1850,28 @@
 		ext("rp|getObjectY");
 		break;
 
+	case 0xF0:
+		ext("rp|getObjectImageX");
+		break;
+	case 0xF1:
+		ext("rp|getObjectImageY");
+		break;
+	case 0xF2:
+		ext("rp|getObjectImageWidth");
+		break;
+	case 0xF3:
+		ext("rp|getObjectImageHeight");
+		break;
+	case 0xF4:
+		ext("rp|getVerbX");
+		break;
+	case 0xF5:
+		ext("rp|getVerbY");
+		break;
+	case 0xF6:
+		ext("rps|stringWidth");
+		break;
+
 	default:
 		invalidop(NULL, code);
 		break;
@@ -2589,9 +2676,11 @@
 
 	switch (TO_BE_32(*((long *)mem))) {
 	case 'LSCR':
-		// TODO - what about v8 ?
-		if (scriptVersion == 7) {
-			printf("Script# %d\n", mem[8] + (mem[9] << 8));
+		if (scriptVersion == 8) {
+			printf("Script# %d\n", TO_LE_32(*((int32 *)(mem+8))));
+			mem += 12;
+		} else if (scriptVersion == 7) {
+			printf("Script# %d\n", TO_LE_16(*((int16 *)(mem+8))));
 			mem += 10;
 		} else {
 			printf("Script# %d\n", (unsigned char)mem[8]);





More information about the Scummvm-git-logs mailing list