Ticket #8074: descumm7.diff

tools/descumm6.cpp

@@ -144 +144 @@
 byte dontShowOpcode;
 byte dontShowOffsets;
 byte haltOnError;
+byte scriptVersion = 6;
 
 BlockStack *block_stack;
 int num_block_stack;
@@ -1477 +1478 @@
                                  "\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 +1525 @@
                                 case 'h':
                                         haltOnError = 1;
                                         break;
+                                case '7':
+                                        scriptVersion = 7;
+                                        break;
                                 default:
                                         ShowHelpAndExit();
                                 }
@@ -1554 +1561 @@
         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;