wip

Author: einstein95

engines/scumm/extract_mm_c64.cpp

@@ -36,12 +36,12 @@ static const int SectorOffset[36] = {
 	598, 615, 632, 649, 666
 };
 static const int ResourcesPerFile[NUM_ROOMS] = {
-	 0, 11,  1,  3,  9, 12,  1, 13, 10,  6,
-	 4,  1,  7,  1,  1,  2,  7,  8, 19,  9,
-	 6,  9,  2,  6,  8,  4, 16,  8,  3,  3,
-	12, 12,  2,  8,  1,  1,  2,  1,  9,  1,
-	 3,  7,  3,  3, 13,  5,  4,  3,  1,  1,
-	 3, 10,  1,  0,  0
+	 0, 12,  0,  2,  1, 12,  1, 13,  6,  0,
+	 31, 0,  1,  0,  0,  0,  0,  1,  1,  1,
+	 0,  1,  0,  0,  2,  0,  0,  1,  0,  0,
+	 2,  7,  1, 11,  0,  0,  5,  1,  0,  0,
+	 1,  0,  1,  3,  4,  3,  1,  0,  0,  1,
+	 2,  2,  0,  0,  0
 };
 
 ExtractMMC64::ExtractMMC64(const std::string &name) : Tool(name, TOOLTYPE_EXTRACTION) {
@@ -50,12 +50,8 @@ ExtractMMC64::ExtractMMC64(const std::string &name) : Tool(name, TOOLTYPE_EXTRAC
 	input1.format = "*.d64";
 	_inputPaths.push_back(input1);
 
-	ToolInput input2;
-	input2.format = "*.d64";
-	_inputPaths.push_back(input2);
-
 	_shorthelp = "Extract data files from the C64 version of Maniac Mansion.";
-	_helptext = "\nUsage: " + _name + " [-o <output dir> = out/] <disk1.d64> <disk2.d64>\n\t" + _shorthelp + "\n";
+	_helptext = "\nUsage: " + _name + " [-o <output dir> = out/] <disk1.d64>\n\t" + _shorthelp + "\n";
 }
 
 void ExtractMMC64::execute() {
@@ -64,31 +60,26 @@ void ExtractMMC64::execute() {
 	char fname[256];
 
 	Common::Filename inpath1(_inputPaths[0].path);
-	Common::Filename inpath2(_inputPaths[1].path);
 	Common::Filename &outpath = _outputPath;
 
 	if (outpath.empty())
 		// Standard output path
 		outpath.setFullPath("out/");
 
 	Common::File input1(inpath1, "rb");
-	Common::File input2(inpath2, "rb");
 
 	/* check signature */
 	signature = input1.readUint16LE();
 	if (signature != 0x0A31)
 		error("Signature not found in disk 1!");
-	signature = input2.readUint16LE();
-	if (signature != 0x0132)
-		error("Signature not found in disk 2!");
 
 	outpath.setFullName("00.LFL");
 	Common::File output(outpath, "wb");
 	output.setXorMode(0xFF);
 	print("Creating 00.LFL...");
 
 	/* write signature */
-	output.writeUint16LE(signature);
+	output.writeUint16LE(0x0132);
 
 	/* copy object flags */
 	for (i = 0; i < 256; i++)
@@ -127,10 +118,8 @@ void ExtractMMC64::execute() {
 	for (i = 0; i < NUM_ROOMS; i++) {
 		Common::File *input;
 
-		if (room_disks[i] == '1')
+		if (room_disks[i] == '1' || room_disks[i] == '2')
 			input = &input1;
-		else if (room_disks[i] == '2')
-			input = &input2;
 		else
 			continue;