[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.46,1.47 descumm6.cpp,1.104,1.105

[Jonathan Gray]

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

Modified Files:
	descumm.cpp descumm6.cpp 
Log Message:
add flag for humongous games

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- descumm.cpp	18 May 2003 12:08:34 -0000	1.46
+++ descumm.cpp	19 May 2003 14:02:05 -0000	1.47
@@ -1096,7 +1096,7 @@
 		// strcpy(buf, "Unknown??");
 		// printf("UGH, unknown room op %d\n", opcode & 0x1F);
 		// exit(1);
-		sprintf(buf, "UnknownRoomCommand%.2X", opcode);
+		sprintf(buf, "UnknownRoomCommand%.2X", opcode & 0x1F);
 	}
 }
 

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- descumm6.cpp	16 May 2003 02:29:39 -0000	1.104
+++ descumm6.cpp	19 May 2003 14:02:06 -0000	1.105
@@ -118,6 +118,7 @@
 
 StackEnt *stack[128];
 int num_stack;
+bool HumongousFlag = false;
 
 char *output;
 
@@ -2009,6 +2010,10 @@
 		jump();
 		break;
 	case 0x74:
+		if (HumongousFlag) {
+			ext("pp|startSound");
+			break;
+		}
 		ext("p|startSound");
 		break;
 	case 0x75:
@@ -2478,6 +2483,10 @@
 	case 0xED:
 		ext("rp|getObjectNewDir");
 		break;
+	case 0xFA:
+		get_byte();
+		ext("s|unknownFA");
+		break;
 	default:
 		invalidop(NULL, code);
 		break;
@@ -2495,6 +2504,7 @@
 			"\t-7\tInput Script is v7\n"
 			"\t-8\tInput Script is v8\n"
 			"\t-o\tAlways Show offsets\n"
+			"\t-p\tInput Script is from Humongous Entertainment game\n"
 			"\t-i\tDon't output ifs\n"
 			"\t-e\tDon't output else\n"
 			"\t-f\tDon't output else-if\n"
@@ -2541,6 +2551,11 @@
 
 				case 'o':
 					alwaysShowOffs = true;
+					break;
+				case 'p':
+					scriptVersion = 6;
+					g_jump_opcode = 0x73;
+					HumongousFlag = true;
 					break;
 				case 'i':
 					dontOutputIfs = true;