thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support for MM NES German. Thanks Joachim Eberhard for donating the

Browse source 
cartridge.

svn-id: r20086
This commit is contained in:
Eugene Sandulenko 2006-01-18 16:12:44 +00:00
parent 91e321c107
commit c350d1487b
5 changed files with 811 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/scumm-md5.h
View file

@ -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! DO NOT EDIT MANUALLY!
*/ */
@ -84,6 +84,7 @@ static const MD5Table md5table[] = {
{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", Common::EN_USA, Common::kPlatformWindows }, { "22c9eb04455440131ffc157aeb8d40a8", "fbear", Common::EN_USA, Common::kPlatformWindows },
{ "22d07d6c386c9c25aca5dac2a0c0d94b", "maniac", Common::SE_SWE, Common::kPlatformNES }, { "22d07d6c386c9c25aca5dac2a0c0d94b", "maniac", Common::SE_SWE, Common::kPlatformNES },
{ "22f4ea88a09da12df9308ba30bcb7d0f", "loom", Common::EN_USA, Common::kPlatformPC }, { "22f4ea88a09da12df9308ba30bcb7d0f", "loom", Common::EN_USA, Common::kPlatformPC },
{ "257f8c14d8c584f7ddd601bcb00920c7", "maniac", Common::DE_DEU, Common::kPlatformNES },
{ "2723fea3dae0cb47768c424b145ae0e7", "tentacle", Common::EN_USA, Common::kPlatformPC }, { "2723fea3dae0cb47768c424b145ae0e7", "tentacle", Common::EN_USA, Common::kPlatformPC },
{ "27b3a4224ad63d5b04627595c1c1a025", "zak", Common::IT_ITA, Common::kPlatformAmiga }, { "27b3a4224ad63d5b04627595c1c1a025", "zak", Common::IT_ITA, Common::kPlatformAmiga },
{ "28d24a33448fab6795850bc9f159a4a2", "atlantis", Common::JA_JPN, Common::kPlatformFMTowns }, { "28d24a33448fab6795850bc9f159a4a2", "atlantis", Common::JA_JPN, Common::kPlatformFMTowns },

9
scumm/scumm.cpp
View file

@ -1,6 +1,6 @@
/* ScummVM - Scumm Interpreter /* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus * 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -501,13 +501,15 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
{"31b8fda4c8c7413fa6b39997e776eba4", "Loom (FM-TOWNS Jp)", GID_LOOM, 3, 0, MDT_TOWNS, {"31b8fda4c8c7413fa6b39997e776eba4", "Loom (FM-TOWNS Jp)", GID_LOOM, 3, 0, MDT_TOWNS,
GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns}, 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}, 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, {"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}, 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, {"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}, 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}, 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, {"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}, GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformPC},
@ -711,6 +713,7 @@ static SubstResFileNames substResFileNameTable[] = {
{ "00.LFL", "Maniac Mansion (F).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (F).prg", kGenAsIs },
{ "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs },
{ "00.LFL", "Maniac Mansion (U).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (U).prg", kGenAsIs },
{ "00.LFL", "Maniac Mansion (G).prg", kGenAsIs },
{ "00.LFL", "maniac1.d64", kGenAsIs }, // Do not { "00.LFL", "maniac1.d64", kGenAsIs }, // Do not
{ "01.LFL", "maniac2.d64", kGenAsIs }, // swap { "01.LFL", "maniac2.d64", kGenAsIs }, // swap
{ "00.LFL", "zak1.d64", kGenAsIs }, // these { "00.LFL", "zak1.d64", kGenAsIs }, // these

1346
scumm/util.cpp
View file

File diff suppressed because it is too large Load diff

6
scumm/util.h
View file

@ -74,10 +74,13 @@ public:
kROMsetEurope, kROMsetEurope,
kROMsetSweden, kROMsetSweden,
kROMsetFrance, kROMsetFrance,
kROMsetGermany,
kROMsetNum kROMsetNum
}; };
struct Resource; struct Resource;
struct LFLEntry;
struct LFL;
private: private:
Common::MemoryReadStream *_stream; Common::MemoryReadStream *_stream;
@ -88,9 +91,6 @@ private:
bool generateResource(int res); bool generateResource(int res);
uint16 extractResource(Common::WriteStream *out, Resource *res); uint16 extractResource(Common::WriteStream *out, Resource *res);
uint32 resOffset(Resource *res);
uint16 resLength(Resource *res);
byte fileReadByte(); byte fileReadByte();
uint16 fileReadUint16LE(); uint16 fileReadUint16LE();

1
tools/scumm-md5.txt
View file

@ -5,6 +5,7 @@ Maniac Mansion
V1.5 NES en d8d07efcb88f396bee0b402b10c3b1c9 maniac V1.5 NES en d8d07efcb88f396bee0b402b10c3b1c9 maniac
V1.5 NES en 3905799e081b80a61d4460b7b733c206 maniac V1.5 NES en 3905799e081b80a61d4460b7b733c206 maniac
V1.5 NES de 257f8c14d8c584f7ddd601bcb00920c7 maniac
V1.5 NES fr 81bbfa181184cb494e7a81dcfa94fbd9 maniac V1.5 NES fr 81bbfa181184cb494e7a81dcfa94fbd9 maniac
V1.5 NES se 22d07d6c386c9c25aca5dac2a0c0d94b maniac V1.5 NES se 22d07d6c386c9c25aca5dac2a0c0d94b maniac
V1.5 (extracted) NES en 17f7296f63c78642724f057fd8e736a7 maniac V1.5 (extracted) NES en 17f7296f63c78642724f057fd8e736a7 maniac