[Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.161,2.162 scumm.cpp,1.697,1.698 util.cpp,2.15,2.16 util.h,2.15,2.16

Eugene Sandulenko sev at users.sourceforge.net
Wed Jan 18 08:13:19 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29602/scumm

Modified Files:
	scumm-md5.h scumm.cpp util.cpp util.h 
Log Message:
Support for MM NES German. Thanks Joachim Eberhard for donating the
cartridge.


Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.161
retrieving revision 2.162
diff -u -d -r2.161 -r2.162
--- scumm-md5.h	18 Jan 2006 11:46:31 -0000	2.161
+++ scumm-md5.h	18 Jan 2006 16:12:44 -0000	2.162
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Wed Jan 18 11:45:39 2006
+  This file was generated by the md5table tool on Wed Jan 18 16:05:54 2006
   DO NOT EDIT MANUALLY!
  */
 
@@ -84,6 +84,7 @@
 	{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", Common::EN_USA, Common::kPlatformWindows },
 	{ "22d07d6c386c9c25aca5dac2a0c0d94b", "maniac", Common::SE_SWE, Common::kPlatformNES },
 	{ "22f4ea88a09da12df9308ba30bcb7d0f", "loom", Common::EN_USA, Common::kPlatformPC },
+	{ "257f8c14d8c584f7ddd601bcb00920c7", "maniac", Common::DE_DEU, Common::kPlatformNES },
 	{ "2723fea3dae0cb47768c424b145ae0e7", "tentacle", Common::EN_USA, Common::kPlatformPC },
 	{ "27b3a4224ad63d5b04627595c1c1a025", "zak", Common::IT_ITA, Common::kPlatformAmiga },
 	{ "28d24a33448fab6795850bc9f159a4a2", "atlantis", Common::JA_JPN, Common::kPlatformFMTowns },

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -d -r1.697 -r1.698
--- scumm.cpp	18 Jan 2006 13:55:06 -0000	1.697
+++ scumm.cpp	18 Jan 2006 16:12:44 -0000	1.698
@@ -1,6 +1,6 @@
 /* ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
+ * Copyright (C) 2001-2006 The ScummVM project
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -501,13 +501,15 @@
 	{"31b8fda4c8c7413fa6b39997e776eba4", "Loom (FM-TOWNS Jp)", GID_LOOM, 3, 0, MDT_TOWNS,
 	 GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns},
 
-	{"d8d07efcb88f396bee0b402b10c3b1c9", "Maniac Mansion (NES E)", GID_MANIAC, 1, 0, MDT_NONE,
+	{"3905799e081b80a61d4460b7b733c206", "Maniac Mansion (NES E)", GID_MANIAC, 1, 0, MDT_NONE,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformNES},
 	{"81bbfa181184cb494e7a81dcfa94fbd9", "Maniac Mansion (NES F)", GID_MANIAC, 1, 0, MDT_NONE,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformNES},
+	{"257f8c14d8c584f7ddd601bcb00920c7", "Maniac Mansion (NES G)", GID_MANIAC, 1, 0, MDT_NONE,
+	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformNES},
 	{"22d07d6c386c9c25aca5dac2a0c0d94b", "Maniac Mansion (NES SW)", GID_MANIAC, 1, 0, MDT_NONE,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformNES},
-	{"3905799e081b80a61d4460b7b733c206", "Maniac Mansion (NES U)", GID_MANIAC, 1, 0, MDT_NONE,
+	{"d8d07efcb88f396bee0b402b10c3b1c9", "Maniac Mansion (NES U)", GID_MANIAC, 1, 0, MDT_NONE,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformNES},
 	{"7f45ddd6dbfbf8f80c0c0efea4c295bc", "Maniac Mansion (v1)", GID_MANIAC, 1, 0, MDT_PCSPK,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformPC},
@@ -711,6 +713,7 @@
 	{ "00.LFL", "Maniac Mansion (F).prg", kGenAsIs },
 	{ "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs },
 	{ "00.LFL", "Maniac Mansion (U).prg", kGenAsIs },
+	{ "00.LFL", "Maniac Mansion (G).prg", kGenAsIs },
 	{ "00.LFL", "maniac1.d64", kGenAsIs }, // Do not
 	{ "01.LFL", "maniac2.d64", kGenAsIs }, // swap
 	{ "00.LFL", "zak1.d64", kGenAsIs },    // these

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- util.cpp	18 Oct 2005 01:30:21 -0000	2.15
+++ util.cpp	18 Jan 2006 16:12:44 -0000	2.16
@@ -1,5 +1,5 @@
 /* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2005 The ScummVM project
+ * Copyright (C) 2002-2006 The ScummVM project
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -296,8 +296,8 @@
 };
 
 struct ScummNESFile::Resource {
-	uint32 offset[kROMsetNum];
[...1501 lines suppressed...]
 
@@ -1201,7 +1450,7 @@
 	write_byte(&out, 0x43);
 	write_byte(&out, 0x46);
 
-	extractResource(&out, &res_globdata);
+	extractResource(&out, &res_globdata[_ROMset][0]);
 
 	for (i = 0; i < (int)sizeof(lfl_index); i++)
 		write_byte(&out, ((byte *)&lfl_index)[i]);
@@ -1236,6 +1485,9 @@
 			} else if (!strcmp(md5str, "81bbfa181184cb494e7a81dcfa94fbd9")) {
 				_ROMset = kROMsetFrance;
 				debug(2, "ROM contents verified as Maniac Mansion (France)");
+			} else if (!strcmp(md5str, "257f8c14d8c584f7ddd601bcb00920c7")) {
+				_ROMset = kROMsetGermany;
+				debug(2, "ROM contents verified as Maniac Mansion (Germany)");
 			} else {
 				error("Unsupported Maniac Mansion ROM, md5: %s", md5str);
 				return false;

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- util.h	18 Oct 2005 01:30:21 -0000	2.15
+++ util.h	18 Jan 2006 16:12:44 -0000	2.16
@@ -74,10 +74,13 @@
 		kROMsetEurope,
 		kROMsetSweden,
 		kROMsetFrance,
+		kROMsetGermany,
 		kROMsetNum
 	};
 
 	struct Resource;
+	struct LFLEntry;
+	struct LFL;
 
 private:
 	Common::MemoryReadStream *_stream;
@@ -88,9 +91,6 @@
 	bool generateResource(int res);
 	uint16 extractResource(Common::WriteStream *out, Resource *res);
 
-	uint32 resOffset(Resource *res);
-	uint16 resLength(Resource *res);
-
 	byte fileReadByte();
 	uint16 fileReadUint16LE();
 





More information about the Scummvm-git-logs mailing list