[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.8,1.9 readme.txt,1.3,1.4

[James Brown]

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

Modified Files:
	descumm6.cpp readme.txt 
Log Message:
Patch 616901: descumm6 hack for LSCR's in FT (and maybe The Dig)


Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- descumm6.cpp	12 Sep 2002 06:54:59 -0000	1.8
+++ descumm6.cpp	1 Oct 2002 15:14:58 -0000	1.9
@@ -144,6 +144,7 @@
 byte dontShowOpcode;
 byte dontShowOffsets;
 byte haltOnError;
+byte scriptVersion = 6;
 
 BlockStack *block_stack;
 int num_block_stack;
@@ -1477,7 +1478,10 @@
 				 "\t-i\tDon't output ifs\n"
 				 "\t-e\tDon't output else\n"
 				 "\t-f\tDon't output else-if\n"
-				 "\t-c\tDon't show opcode\n" "\t-x\tDon't show offsets\n" "\t-h\tHalt on error\n");
+				 "\t-c\tDon't show opcode\n"
+				 "\t-x\tDon't show offsets\n"
+				 "\t-h\tHalt on error\n"
+				 "\t-7\tAssume V7 scripts\n");
 	exit(0);
 }
 
@@ -1521,6 +1525,9 @@
 				case 'h':
 					haltOnError = 1;
 					break;
+				case '7':
+					scriptVersion = 7;
+					break;
 				default:
 					ShowHelpAndExit();
 				}
@@ -1554,8 +1561,13 @@
 	switch (*((long *)mem)) {
 #endif
 	case 'RCSL':
-		printf("Script# %d\n", (unsigned char)mem[8]);
-		mem += 9;
+		if (scriptVersion == 7) {
+			printf("Script# %d\n", mem[8] + (mem[9] << 8));
+			mem += 10;
+		} else {
+			printf("Script# %d\n", (unsigned char)mem[8]);
+			mem += 9;
+		}
 		break;											/* Local script */
 	case 'PRCS':
 		mem += 8;

Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/tools/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- readme.txt	15 Apr 2002 08:05:28 -0000	1.3
+++ readme.txt	1 Oct 2002 15:14:59 -0000	1.4
@@ -14,4 +14,5 @@
         descumm5.cpp - Decompiles SCUMM V4/V5 scripts (eg, monkey1/2, FOA)
 
         descumm6.cpp - Decompiles SCUMM V6/V7/V8 scripts (eg, dott, FT, etc)
-
+		       (When decompiling V7 'room-' scripts, you may need to 
+                       use the -7 switch)