[Scummvm-git-logs] scummvm master -> 1c714952cee9aad7181d484f75502d88a53d491b
sev-
sev at scummvm.org
Sun Oct 17 17:48:25 UTC 2021
This automated email contains information about 22 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a82de67a5d AD: Reduce code duplication
d4443ed494 AD: Correctly process small files
4eea8524f7 COMMON: Add possibility to compute md5 for tail of resfork data
7ccce1d97b AD: Compute tail or mac resfork when requested
47a277542e DIRECTOR: Added mactos for tail md5s
9b3427d7d4 DISTS: ANDROID: Update link to the Android guide
6aaf3018b9 WAGE: WIP on additional games
91b91c0cba COMMON: Fix bug in Mac resfork data size calculation. This invalidates many detection entries
51fc49e19d WAGE: Update detection entries resfork file sizes
401126f9f7 DIRECTOR: Disable detection entry with invalid punycode
37f0024b0a MACVENTURE: Adjust detection entries after MacResMan bugfix
8676f4b2fe DIRECTOR: Fix preloadCast without arguments
c65768931b DIRECTOR: Disabled entry with incorrect punycode
ed0b5042f3 DIRECTOR: Changed The Apartment Mac detection after the MacResMan changes
33115992a0 STARTREK: Fix Mac version detection entry after MacResMan changes
ac4476f555 PEGASUS: Marked invalid Mac detection entries after MacResMan changes
521b5b7a2d SCI: Updated few Mac detection entries and marked the rest after MacResMan changes
aca4e2fd43 GROOVIE: Marked detection entry invalidated by MacResMan changes
52b7d0b0c3 HADESCH: Marked detection entry invalidated by MacResMan changes
0f9b4ef305 AD: Added more debug output
d33ef146ae MADE: Fixed detection entry after MacResMan changes
1c714952ce HADESCH: Fixed Mac entry after MacResMan changes
Commit: a82de67a5d482ad9938e1ffd330bf9f3c0eb570a
https://github.com/scummvm/scummvm/commit/a82de67a5d482ad9938e1ffd330bf9f3c0eb570a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:01+03:00
Commit Message:
AD: Reduce code duplication
Changed paths:
engines/advancedDetector.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index a770ca6fcd..4e7626f312 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -495,6 +495,8 @@ static char flagsToMD5Prefix(uint32 flags) {
return 'f';
}
+static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps);
+
bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
Common::String hashname = Common::String::format("%c:%s:%d", flagsToMD5Prefix(game.flags), fname.c_str(), _md5Bytes);
@@ -504,44 +506,21 @@ bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, con
return true;
}
- if (game.flags & ADGF_MACRESFORK) {
- FileMapArchive fileMapArchive(allFiles);
+ bool res = getFilePropertiesIntern(_md5Bytes, allFiles, game, fname, fileProps);
- Common::MacResManager macResMan;
-
- if (!macResMan.open(fname, fileMapArchive))
- return false;
-
- fileProps.md5 = macResMan.computeResForkMD5AsString(_md5Bytes);
- fileProps.size = macResMan.getResForkDataSize();
-
- if (fileProps.size != 0) {
- MD5Man.setMD5(hashname, fileProps.md5);
- MD5Man.setSize(hashname, fileProps.size);
- return true;
- }
+ if (res) {
+ MD5Man.setMD5(hashname, fileProps.md5);
+ MD5Man.setSize(hashname, fileProps.size);
}
- if (!allFiles.contains(fname))
- return false;
-
- Common::File testFile;
-
- if (!testFile.open(allFiles[fname]))
- return false;
-
- fileProps.md5 = Common::computeStreamMD5AsString(testFile, _md5Bytes);
- fileProps.size = testFile.size();
- MD5Man.setMD5(hashname, fileProps.md5);
- MD5Man.setSize(hashname, fileProps.size);
-
- return true;
+ return res;
}
bool AdvancedMetaEngine::getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
- // FIXME/TODO: We don't handle the case that a file is listed as a regular
- // file and as one with resource fork.
+ return getFilePropertiesIntern(md5Bytes, allFiles, game, fname, fileProps);
+}
+static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) {
if (game.flags & ADGF_MACRESFORK) {
FileMapArchive fileMapArchive(allFiles);
Commit: d4443ed494e82788df07d982c5c748f1b77763b6
https://github.com/scummvm/scummvm/commit/d4443ed494e82788df07d982c5c748f1b77763b6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:01+03:00
Commit Message:
AD: Correctly process small files
Changed paths:
engines/advancedDetector.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 4e7626f312..b84f393c4a 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -544,8 +544,10 @@ static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::Fil
if (!testFile.open(allFiles[fname]))
return false;
- if (game.flags & ADGF_TAILMD5)
- testFile.seek(md5Bytes, SEEK_END);
+ if (game.flags & ADGF_TAILMD5) {
+ if (testFile.size() > md5Bytes)
+ testFile.seek(md5Bytes, SEEK_END);
+ }
fileProps.size = testFile.size();
fileProps.md5 = Common::computeStreamMD5AsString(testFile, md5Bytes);
Commit: 4eea8524f73eaf156e92dface4d95761b68f1f47
https://github.com/scummvm/scummvm/commit/4eea8524f73eaf156e92dface4d95761b68f1f47
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:01+03:00
Commit Message:
COMMON: Add possibility to compute md5 for tail of resfork data
Changed paths:
common/macresman.cpp
common/macresman.h
diff --git a/common/macresman.cpp b/common/macresman.cpp
index b8d8fdc4e1..6d898d146e 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -102,7 +102,7 @@ uint32 MacResManager::getResForkDataSize() const {
return _stream->readUint32BE();
}
-String MacResManager::computeResForkMD5AsString(uint32 length) const {
+String MacResManager::computeResForkMD5AsString(uint32 length, bool tail) const {
if (!hasResFork())
return String();
@@ -113,6 +113,9 @@ String MacResManager::computeResForkMD5AsString(uint32 length) const {
SeekableSubReadStream resForkStream(_stream, dataOffset, dataOffset + dataLength);
+ if (tail && dataLength > length)
+ resForkStream.seek(length, SEEK_END);
+
return computeStreamMD5AsString(resForkStream, MIN<uint32>(length, _resForkSize));
}
diff --git a/common/macresman.h b/common/macresman.h
index f03b558008..43e2a8c753 100644
--- a/common/macresman.h
+++ b/common/macresman.h
@@ -170,9 +170,10 @@ public:
/**
* Calculate the MD5 checksum of the resource fork
* @param length The maximum length to compute for
+ * @param tail Caluclate length from the tail
* @return The MD5 checksum of the resource fork
*/
- String computeResForkMD5AsString(uint32 length = 0) const;
+ String computeResForkMD5AsString(uint32 length = 0, bool tail = false) const;
/**
* Get the base file name of the data/resource fork pair
Commit: 7ccce1d97ba33d0ca99bad7555d5941493a4d0cd
https://github.com/scummvm/scummvm/commit/7ccce1d97ba33d0ca99bad7555d5941493a4d0cd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:01+03:00
Commit Message:
AD: Compute tail or mac resfork when requested
Changed paths:
engines/advancedDetector.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b84f393c4a..267ae63024 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -487,8 +487,11 @@ namespace Common {
}
static char flagsToMD5Prefix(uint32 flags) {
- if (flags & ADGF_MACRESFORK)
+ if (flags & ADGF_MACRESFORK) {
+ if (flags & ADGF_TAILMD5)
+ return 'e';
return 'm';
+ }
if (flags & ADGF_TAILMD5)
return 't';
@@ -529,7 +532,7 @@ static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::Fil
if (!macResMan.open(fname, fileMapArchive))
return false;
- fileProps.md5 = macResMan.computeResForkMD5AsString(md5Bytes);
+ fileProps.md5 = macResMan.computeResForkMD5AsString(md5Bytes, ((game.flags & ADGF_TAILMD5) != 0));
fileProps.size = macResMan.getResForkDataSize();
if (fileProps.size != 0)
Commit: 47a277542ed44e6ee3a143f349a285cfbc715db1
https://github.com/scummvm/scummvm/commit/47a277542ed44e6ee3a143f349a285cfbc715db1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
DIRECTOR: Added mactos for tail md5s
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index aa023776b8..7b5d1a4395 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1186,9 +1186,11 @@ namespace Director {
#define SUPPORT_STATUS ADGF_UNSTABLE
#define GENGAME1_(t,e,f,m,s,l,p,fl,v) { { t, e, AD_ENTRY1s(f, m, s), l, p, (fl | SUPPORT_STATUS), GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
+#define GENGAME1t_(t,e,f,m,s,l,p,fl,v) { { t, e, AD_ENTRY1s(f, m, s), l, p, (fl | SUPPORT_STATUS | ADGF_TAILMD5), GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
#define GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,l,p,fl,v) { { t, e, AD_ENTRY2s(f1, m1, s1, f2, m2, s2), l, p, (fl | SUPPORT_STATUS), GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
#define MACGAME1(t,e,f,m,s,v) GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
+#define MACGAME1t(t,e,f,m,s,v) GENGAME1t_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
#define PIPGAME1(t,e,f,m,s,v) GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformPippin,ADGF_MACRESFORK,v)
#define WINGAME1(t,e,f,m,s,v) GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
#define FMTGAME1(t,e,f,m,s,v) GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformFMTowns,ADGF_NO_FLAGS,v)
@@ -3359,7 +3361,7 @@ static const DirectorGameDescription gameDescriptions[] = {
MACDEMO2_l("wallobee", "Demo", "xn--baa0pja0512dela6bueub9gshf1k1a1rt742c060a2x4u", "0666ae690e459d3d0d91800ebd94de46", 291036,
"001b.mov", "2b49fe4e49f9e846fb6e78f92e9a296d", 6931,
Common::JA_JPN, 402),
- MACDEMO2_l("wallobee2", "Demo", "xn--baa0pja0512dela6bueub9gshf1k1a1rt742c060a2x4u", "0666ae690e459d3d0d91800ebd94de46", 291036,
+ MACDEMO2_l("wallobee2", "Demo", "xn--baa0pja0512dela6bueub9gshf1k1a1rt742c060a2x4u", "0666ae690e459d3d0d91800ebd94de46", 291036,
"000.MOV", "92db07a408eca6bc0ebc230e31e6caa4", 461940,
Common::JA_JPN, 402),
Commit: 9b3427d7d4c02824cca537e645cf4889e4e67457
https://github.com/scummvm/scummvm/commit/9b3427d7d4c02824cca537e645cf4889e4e67457
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
DISTS: ANDROID: Update link to the Android guide
Changed paths:
dists/android/store/metadata-de-DE.txt
dists/android/store/metadata-en-US.txt
diff --git a/dists/android/store/metadata-de-DE.txt b/dists/android/store/metadata-de-DE.txt
index b8a4eb1300..9699b7a605 100644
--- a/dists/android/store/metadata-de-DE.txt
+++ b/dists/android/store/metadata-de-DE.txt
@@ -16,7 +16,7 @@ ScummVM bietet die Möglichkeit, viele klassische Point-and-Click-Adventures und
Weitere Informationen hierzu sowie einige kostenfreie Spiele findest du auf unserer Website. Eine aktuelle Liste mit Bezugsquellen findest du auch in unserem Wiki unter https://wiki.scummvm.org/index.php/Where_to_get_the_games.
-Ebenfalls auf unserer Website findest du unter der URL https://wiki.scummvm.org/index.php/Android/Guide weitere Informationen bezüglich der Einrichtung und Nutzung einiger Android-spezifischer Optionen.
+Ebenfalls auf unserer Website findest du unter der URL https://docs.scummvm.org/en/v2.5.0/other_platforms/android.html weitere Informationen bezüglich der Einrichtung und Nutzung einiger Android-spezifischer Optionen.
https://forums.scummvm.org/viewforum.php?f=17 ist unser Forum, wo du dich mit anderen Nutzern über die Android-Version austauschen kannst.
diff --git a/dists/android/store/metadata-en-US.txt b/dists/android/store/metadata-en-US.txt
index 6d14fa0217..1d41a2a42c 100644
--- a/dists/android/store/metadata-en-US.txt
+++ b/dists/android/store/metadata-en-US.txt
@@ -16,7 +16,7 @@ ScummVM provides a way to play many classic graphical point-and-click adventure
You can find more information, and some free-to-download adventure games, on our website. See also an up-to-date list here: https://wiki.scummvm.org/index.php/Where_to_get_the_games
-You can find a quick-start guide on our website at http://wiki.scummvm.org/index.php/Android/Guide which provides some more information, explains how to configure some Android-specific options, and where you can find other help.
+You can find a quick-start guide on our website at https://docs.scummvm.org/en/v2.5.0/other_platforms/android.html which provides some more information, explains how to configure some Android-specific options, and where you can find other help.
http://forums.scummvm.org/viewforum.php?f=17 is our web forum where you can discuss the Android version.
Commit: 6aaf3018b9d37cc8bfcab6a4bd6cfc32dce53ddc
https://github.com/scummvm/scummvm/commit/6aaf3018b9d37cc8bfcab6a4bd6cfc32dce53ddc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
WAGE: WIP on additional games
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 6189758f31..f64494a896 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -181,6 +181,45 @@ static const ADGameDescription gameDescriptions[] = {
FANGAME("Zoony", "3f7418ea8672ea558521c178188cfce5", 154990), // original filename "Zoonyâ„¢"
FANGAME("Zoony", "55d3d42b5dca9630eb28ad464f343c67", 154990), // original filename "Zoonyâ„¢", alt version
+#if 0
+ // These are TODO
+ {"grailquest", "GrailQuest: Adventure in the Age of King Arthur"},
+
+ FANGAME("Dash Hansen and the Search for the Black Orchid");
+ FANGAME("Deep Angst II: The Nightmare Ends");
+ FANGAME("Escape From Saecvrom");
+ FANGAME("Maze of the Questing Beast");
+ FANGAME("Pirate Attack!");
+ FANGAME("Robot Planet");
+ FANGAME("Starport");
+ FANGAME("MythWorld");
+ FANGAME("Brownie Saves the Day");
+ FANGAME("Brownie's Dream");
+ FANGAME("Can James Be Found?");
+ FANGAME("SparGate");
+ FANGAME("The Time Squisher");
+ FANGAME("Who Shot Brownie Dog?");
+ FANGAME("Brownie's Time Travels");
+ FANGAME("The Adventures of Steve Reeve");
+ FANGAME("Palace of Sand (Sultan's Palace)");
+ FANGAME("Sword of Siegfried");
+ FANGAME("Introduction to Gothic");
+
+ // modified
+ FANGAME("The Ashland revolution");
+ FANGAME("Jamie the Demon Slayer");
+ FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "89ecb4cef5cc4036e54f8bc45ce7520e", 721569),
+ FANGAME("Nightcrawler Ned", "8423fc015c395bd6be54a7ea69170d99", 366542),
+ FANGAME("The Axe-orcist", "9718b72e86a9727bbd68e12fa992b268", 308764),
+ BIGGAME("scepters", "", "Scepters", "2c824f1bd7b22c575c7be86ac88ebd23", 347540), // alt version
+ FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "49a0708da81dbeb28c6e607429c92209", 408913),
+ BIGGAME("twisted", "", "Twisted! 1.6", "6e0be4c7d83231e56a431dc4ef7bf978", 960954),
+ FANGAME("P-W Adventure", "a8e9f97ee02f01de588a4dbabe55ca3f", 219216),
+ FANGAME("Quest for T-Rex", "51aa29d24ca702c8980e959706ef0b76", 592584),
+ FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "4730d0c47d13401d73353e980f91a304", 645318),
+ FANGAME("Star Trek", "3067332e6f0bb0314579f9bf102e1b56", 53320),
+#endif
+
AD_TABLE_END_MARKER
};
Commit: 91b91c0cbaab0b1202a788148639f5c2f9d32271
https://github.com/scummvm/scummvm/commit/91b91c0cbaab0b1202a788148639f5c2f9d32271
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
COMMON: Fix bug in Mac resfork data size calculation. This invalidates many detection entries
Changed paths:
common/macresman.cpp
diff --git a/common/macresman.cpp b/common/macresman.cpp
index 6d898d146e..87ae6cd818 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -98,7 +98,7 @@ uint32 MacResManager::getResForkDataSize() const {
if (!hasResFork())
return 0;
- _stream->seek(_resForkOffset + 4);
+ _stream->seek(_resForkOffset + 8);
return _stream->readUint32BE();
}
Commit: 51fc49e19d7ddc22dec97737d926d2bf5cf3e8cd
https://github.com/scummvm/scummvm/commit/51fc49e19d7ddc22dec97737d926d2bf5cf3e8cd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
WAGE: Update detection entries resfork file sizes
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index f64494a896..b6800e31c9 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -32,154 +32,155 @@ namespace Wage {
#define BIGGAME(t,v,f,m,s) { t,v,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_DEFAULT,GUIO0()}
static const ADGameDescription gameDescriptions[] = {
- FANGAME("3rd Floor", "931aa0b6ada3aced5117ee6e6daf2fb8", 281409),
- FANGAME("3rd Floor", "140883954b7cd89b0ffabde6ee0073d4", 281423), // alt version
- BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "8bbec64ffe9deee4ff48d27f01176814", 1420723),
- BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "57de8f1f79a24fa1a296aa10242c3648", 1843104),
- FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "18f1f5d1081b9a5676ccfb0c3b857059", 145023), // Original file name "The Ashland Revolution Demo†"
- FANGAME("The Axe-orcist", "9718b72e86a9727bbd68e12fa992b268", 308764),
- FANGAME("Brownie's Dream", "379f2c810efc18bad932049d331df1b6", 440704),
- FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "d95999aff4e283bd21db686cfb2cb9b9", 471589),
- FANGAME("Bug Hunt", "b55b23a5f38d28407bd6c178a64ab629", 195699),
- FANGAME("Bug Hunt", "cd7e1064813b9b0e3cd946e569109b34", 195779), // alt version
- BIGGAME("cantitoe", "", "Camp Cantitoe", "4a44860fdfe5b9e98bcf8433801cd925", 616985),
- FANGAME("Canal District", "061a09e9258145f6a585e869a0319004", 641470),
- FANGAME("Carbon Copy", "322410318c60045928a10f6b4c0b0a87", 519445),
- FANGAME("Castle of Ert", "069daab46729291a615e9ee3528008ff", 198955),
- FANGAMEN("Castle of Ert", "Castle of Ert.1", "ecadcdd9bdee68aeb32507932857db30", 198983), // alt version
- FANGAMEND("Death Mall", "Death Mall Demo", "8284351df1c7b678279139ed486ab127", 254874),
- FANGAME("Deep Angst", "ddc4c8b3d317e2c79a12c53275253ac3", 329550), // Original gile name "Deep Angstâ„¢"
- FANGAME("Deep Ennui", "9879bf659f11c9177d578a347da0c658", 86075),
+ FANGAME("3rd Floor", "931aa0b6ada3aced5117ee6e6daf2fb8", 281153),
+ FANGAME("3rd Floor", "140883954b7cd89b0ffabde6ee0073d4", 281167), // alt version
+ BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "8bbec64ffe9deee4ff48d27f01176814", 1420467),
+ BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "57de8f1f79a24fa1a296aa10242c3648", 1842848),
+ FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "18f1f5d1081b9a5676ccfb0c3b857059", 144767), // Original file name "The Ashland Revolution Demo†"
+ FANGAME("The Axe-orcist", "9718b72e86a9727bbd68e12fa992b268", 308508),
+ FANGAME("Brownie's Dream", "379f2c810efc18bad932049d331df1b6", 440448),
+ FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "d95999aff4e283bd21db686cfb2cb9b9", 471333),
+ FANGAME("Bug Hunt", "b55b23a5f38d28407bd6c178a64ab629", 195443),
+ FANGAME("Bug Hunt", "cd7e1064813b9b0e3cd946e569109b34", 195523), // alt version
+ BIGGAME("cantitoe", "", "Camp Cantitoe", "4a44860fdfe5b9e98bcf8433801cd925", 616729),
+ FANGAME("Canal District", "061a09e9258145f6a585e869a0319004", 641214),
+ FANGAME("Carbon Copy", "322410318c60045928a10f6b4c0b0a87", 519189),
+ FANGAME("Castle of Ert", "069daab46729291a615e9ee3528008ff", 198699),
+ FANGAMEN("Castle of Ert", "Castle of Ert.1", "ecadcdd9bdee68aeb32507932857db30", 198727), // alt version
+ FANGAMEND("Death Mall", "Death Mall Demo", "8284351df1c7b678279139ed486ab127", 254618),
+ FANGAME("Deep Angst", "ddc4c8b3d317e2c79a12c53275253ac3", 329294), // Original gile name "Deep Angstâ„¢"
+ FANGAME("Deep Ennui", "9879bf659f11c9177d578a347da0c658", 85819),
// Polygons with ignored byte 1
- FANGAME("Double Trouble", "1cd05d66163b44f9f0d8c3e7232bc2db", 542371),
- BIGGAME("drakmythcastle", "disk I", "Drakmyth Castle disk I of II", "54dd0a817b667fc05c4f2dee6abe126a", 793784),
- BIGGAME("drakmythcastle", "disk II", "Drakmyth Castle II", "b57af17c805775d7d68b62133164c4e4", 1685659),
+ FANGAME("Double Trouble", "1cd05d66163b44f9f0d8c3e7232bc2db", 542115),
+ BIGGAME("drakmythcastle", "disk I", "Drakmyth Castle disk I of II", "54dd0a817b667fc05c4f2dee6abe126a", 793528),
+ BIGGAME("drakmythcastle", "disk II", "Drakmyth Castle II", "b57af17c805775d7d68b62133164c4e4", 1685403),
// Crash at start in GUI rendering
- FANGAME("Dune Eternity", "4946bc99cc42bf83b628352aa9b81a7b", 290201), // Original file name is "***DUNE ETERNITY*** "
- FANGAMEN("Dungeon World II", "DungeonWorld2", "74a7153f9ae61a59a216078a37f68f2c", 230199),
+ FANGAME("Dune Eternity", "4946bc99cc42bf83b628352aa9b81a7b", 289945), // Original file name is "***DUNE ETERNITY*** "
+ FANGAMEN("Dungeon World II", "DungeonWorld2", "74a7153f9ae61a59a216078a37f68f2c", 229943),
// Made for bigger resolution
- FANGAME("Dynasty of Dar", "e118a261d33831c224f3b776ec5dd2a8", 275693),
- FANGAME("Edg's World", "480bcf68be49ee3765902e922ccdc833", 106769),
- FANGAME("Eidisi I", "ed8fec61ad94ddec06feaf4eb720084b", 172552),
- FANGAME("Eidisi I", "06ae31c4361f9bd5b91593858b6d0d79", 172566), // alt version
+ FANGAME("Dynasty of Dar", "e118a261d33831c224f3b776ec5dd2a8", 275437),
+ FANGAME("Edg's World", "480bcf68be49ee3765902e922ccdc833", 106513),
+ FANGAME("Eidisi I", "ed8fec61ad94ddec06feaf4eb720084b", 172296),
+ FANGAME("Eidisi I", "06ae31c4361f9bd5b91593858b6d0d79", 172310), // alt version
// Problems(?) with text on the first screen
- FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "49a0708da81dbeb28c6e607429c92209", 408913),
- FANGAME("Escape!", "28a9658ee846a34f133df29b54cf255a", 65075), // Original file name "Escape!†"
- FANGAME("Escape from School!", "2055747bb874052333190eb993246a7f", 50105),
- FANGAME("Escape from School!", "fcc581e52d1fc8ea4603d7c953fa935a", 50119), // Original file name "Escape from School!†"
- FANGAME("Everyman 1", "97d78e22493245636f84ad8db732305c", 335705),
- FANGAME("Exploration Zeta!", "9006eff549afadc956e5de4ae6a24fbd", 366599),
+ FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "49a0708da81dbeb28c6e607429c92209", 408657),
+ FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "0095d0e069851521c44ca3cdc94bcba3", 414464), // alt?
+ FANGAME("Escape!", "28a9658ee846a34f133df29b54cf255a", 64819), // Original file name "Escape!†"
+ FANGAME("Escape from School!", "2055747bb874052333190eb993246a7f", 49849),
+ FANGAME("Escape from School!", "fcc581e52d1fc8ea4603d7c953fa935a", 49863), // Original file name "Escape from School!†"
+ FANGAME("Everyman 1", "97d78e22493245636f84ad8db732305c", 335449),
+ FANGAME("Exploration Zeta!", "9006eff549afadc956e5de4ae6a24fbd", 366343),
// Cannot proceed past the first scene
- FANGAMEND("Explorer", "Explorer DEMO", "0ae79f48754466c4cd65137c7f186384", 461228),
+ FANGAMEND("Explorer", "Explorer DEMO", "0ae79f48754466c4cd65137c7f186384", 460972),
// Crash in console rendering on the first scene
- FANGAME("Fantasy Quest", "b52d3e2680a76c23b2791e2c87f6b6bd", 762754),
- FANGAME("Find the Heart", "0c0c282649597ea1ac82d97c8d4029a2", 106235), // From Joshua's Worlds 1.0
- FANGAME("Find the Heart", "08de3248b8c691d9a08af984bdcfa872", 105885), // From Joshua's Worlds. Alt version
- FANGAME("Find the Heart", "73935d313b666763e50d2cdc6b3b7908", 105871), // Standalone
- FANGAMEN("Fortune Teller", "Fortune Teller 1.1", "3c09329fc3c92a70e5c8874cc763f5cb", 73931),
- FANGAMEN("Fred Rogers - Terrorist", "Terrorist", "4398f711bc2a456e6d730641308593f0", 524469), // Original file name "Terrorist†"
- FANGAME("Fred Rogers - Terrorist", "8597a77619847efbce3f1f8b2ceb3258", 524455), // Original file name "Terrorist†"
- FANGAMEN("Haunted House", "Haunted House 1.5", "5e34e9fa13f4c90876f10a40ea1d1c79", 177500),
- FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "c9b3c75814fc6b14feae044157bef252", 231969),
- FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "4658ece81a6f211a828e747125482f48", 231969), // alt version
+ FANGAME("Fantasy Quest", "b52d3e2680a76c23b2791e2c87f6b6bd", 762498),
+ FANGAME("Find the Heart", "0c0c282649597ea1ac82d97c8d4029a2", 105979), // From Joshua's Worlds 1.0
+ FANGAME("Find the Heart", "08de3248b8c691d9a08af984bdcfa872", 105629), // From Joshua's Worlds. Alt version
+ FANGAME("Find the Heart", "73935d313b666763e50d2cdc6b3b7908", 105615), // Standalone
+ FANGAMEN("Fortune Teller", "Fortune Teller 1.1", "3c09329fc3c92a70e5c8874cc763f5cb", 73675),
+ FANGAMEN("Fred Rogers - Terrorist", "Terrorist", "4398f711bc2a456e6d730641308593f0", 524213), // Original file name "Terrorist†"
+ FANGAME("Fred Rogers - Terrorist", "8597a77619847efbce3f1f8b2ceb3258", 524199), // Original file name "Terrorist†"
+ FANGAMEN("Haunted House", "Haunted House 1.5", "5e34e9fa13f4c90876f10a40ea1d1c79", 177244),
+ FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "c9b3c75814fc6b14feae044157bef252", 231713),
+ FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "4658ece81a6f211a828e747125482f48", 231713), // alt version
// Cropped graphics on first scene, cannot pass to in-game
- FANGAME("Intro to Gothic", "606eec666f0b2d767e4423747e740434", 208067),
- FANGAMEN("James Bond 007", "007", "2449924f2cb43454489a4ef91c0ee702", 50663),
+ FANGAME("Intro to Gothic", "606eec666f0b2d767e4423747e740434", 207811),
+ FANGAMEN("James Bond 007", "007", "2449924f2cb43454489a4ef91c0ee702", 50407),
// Lots of unhandled comparisons
- FANGAME("Jamie the Demon Slayer", "ed054aa760569059c7ea554e822089a6", 232789),
- FANGAMEN("Journey", "The Journey 1.6.2 US", "588a516caa187005fdfcbc72823c8eff", 820572),
- FANGAMEN("Jumble", "LSJUMBLE", "555ead186ec1683157e53b96fc4a99d5", 647339), // Original file name is "LSJUMBLE†"
- FANGAME("Karth of the Jungle", "6dae6eef6f46101ba8c9e312bb82e824", 96711),
- FANGAME("Karth of the Jungle", "c869cacc59f2402d06bc8197be28b5df", 96960), // Alternative version
- FANGAME("Karth of the Jungle II", "6f26e0bace5c41d91c135e5e102de5bc", 201053),
- FANGAMEN("Little Pythagoras", "Little Pythagoras 1.1.1", "66a5d2ac1a0df2ee84cbee583c1f1dfe", 628821),
- FANGAME("Lost Crystal", "945a1cf1ead6dd298305935b5ccb21d2", 771072),
- FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "89ecb4cef5cc4036e54f8bc45ce7520e", 721569),
- FANGAME("Lost Princess", "29d9889b566286506ded7d8bec7b75ce", 166758),
- FANGAME("Mac Spudd!", "eaba9195dd27c2a26b809a730417122b", 782115),
- FANGAME("Magic Rings", "263e2c90af61f0798bf41f6a1e3f6345", 109044),
+ FANGAME("Jamie the Demon Slayer", "ed054aa760569059c7ea554e822089a6", 232533),
+ FANGAMEN("Journey", "The Journey 1.6.2 US", "588a516caa187005fdfcbc72823c8eff", 820316),
+ FANGAMEN("Jumble", "LSJUMBLE", "555ead186ec1683157e53b96fc4a99d5", 647083), // Original file name is "LSJUMBLE†"
+ FANGAME("Karth of the Jungle", "6dae6eef6f46101ba8c9e312bb82e824", 96455),
+ FANGAME("Karth of the Jungle", "c869cacc59f2402d06bc8197be28b5df", 96704), // Alternative version
+ FANGAME("Karth of the Jungle II", "6f26e0bace5c41d91c135e5e102de5bc", 200797),
+ FANGAMEN("Little Pythagoras", "Little Pythagoras 1.1.1", "66a5d2ac1a0df2ee84cbee583c1f1dfe", 628565),
+ FANGAME("Lost Crystal", "945a1cf1ead6dd298305935b5ccb21d2", 770816),
+ FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "89ecb4cef5cc4036e54f8bc45ce7520e", 721313),
+ FANGAME("Lost Princess", "29d9889b566286506ded7d8bec7b75ce", 166502),
+ FANGAME("Mac Spudd!", "eaba9195dd27c2a26b809a730417122b", 781859),
+ FANGAME("Magic Rings", "263e2c90af61f0798bf41f6a1e3f6345", 108788),
// No way to click on the house
- FANGAME("Messy House", "32ca71f2ff37997407cead590c2dd306", 177120),
- FANGAME("Midnight Snack", "70ba8a5a1f0304669c9987360bba236f", 67952),
- FANGAME("Midnight Snack", "24973af10822979e23866d88a7d2e15c", 67966), // Alt version
- FANGAME("Mike's House", "591b5a4d52ecf9a7d87256e83b78b0fd", 87357),
- FANGAME("Mike's House", "e4c0b836a21799db3995a921a447c28e", 87343), // Alt version
- FANGAME("Minitorian", "c728dfccdca12571e275a4113b3db343", 586464),
- FANGAME("M'Lord's Warrior", "e0a0622ce2023984e3118141a9688ec5", 465639), // Original file name is "M'Lord's Warrior †"
- FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "4730d0c47d13401d73353e980f91a304", 645318),
- FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "1a7ee052b375f0c0a4c18836c978ce5b", 645333), // Alt version
+ FANGAME("Messy House", "32ca71f2ff37997407cead590c2dd306", 176864),
+ FANGAME("Midnight Snack", "70ba8a5a1f0304669c9987360bba236f", 67696),
+ FANGAME("Midnight Snack", "24973af10822979e23866d88a7d2e15c", 67710), // Alt version
+ FANGAME("Mike's House", "591b5a4d52ecf9a7d87256e83b78b0fd", 87101),
+ FANGAME("Mike's House", "e4c0b836a21799db3995a921a447c28e", 87087), // Alt version
+ FANGAME("Minitorian", "c728dfccdca12571e275a4113b3db343", 586208),
+ FANGAME("M'Lord's Warrior", "e0a0622ce2023984e3118141a9688ec5", 465383), // Original file name is "M'Lord's Warrior †"
+ FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "4730d0c47d13401d73353e980f91a304", 645062),
+ FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "1a7ee052b375f0c0a4c18836c978ce5b", 645077), // Alt version
// Unhandled comparison case
- FANGAME("Mountain of Mayhem", "634211b004371635d191ae0687035501", 750003), // Original file name "Mountain of Mayhem †"
+ FANGAME("Mountain of Mayhem", "634211b004371635d191ae0687035501", 749747), // Original file name "Mountain of Mayhem †"
// No way to pass through the first screen
- FANGAME("Nightcrawler Ned", "8423fc015c395bd6be54a7ea69170d99", 366542),
+ FANGAME("Nightcrawler Ned", "8423fc015c395bd6be54a7ea69170d99", 366286),
// No player in the world
- FANGAMEN("Parrot Talk", "PARROT TALK V1", "c38c090be8c078d931905c93bc0689f5", 118936),
+ FANGAMEN("Parrot Talk", "PARROT TALK V1", "c38c090be8c078d931905c93bc0689f5", 118680),
// No player in the world
- FANGAMEN("Parrot Talk", "PARROT TALKV2", "5ec1df9e2d6d0dcf1a040a95500d9551", 118884),
- FANGAME("Pavilion", "a980e60a291c0a7b949474177affa134", 231687),
- FANGAMEN("Pencils", "Pencils.99", "09dbcdbefe20536c2db1b1a4fb4e5ed3", 408551),
+ FANGAMEN("Parrot Talk", "PARROT TALKV2", "5ec1df9e2d6d0dcf1a040a95500d9551", 118628),
+ FANGAME("Pavilion", "a980e60a291c0a7b949474177affa134", 231431),
+ FANGAMEN("Pencils", "Pencils.99", "09dbcdbefe20536c2db1b1a4fb4e5ed3", 408295),
// Polygons with byte 1
- FANGAME("Periapt", "7e26a7827c694232624321a5a6844511", 406006),
- FANGAME("Periapt", "bc36e40de279d5f0844577fe702d9f64", 406006), // alt version
+ FANGAME("Periapt", "7e26a7827c694232624321a5a6844511", 405750),
+ FANGAME("Periapt", "bc36e40de279d5f0844577fe702d9f64", 405750), // alt version
// Cannot push buttons
- FANGAMEN("The Phoenix v1.2", "The Phoenix", "fee9f1de7ad9096d084461d6066192b1", 431640),
- FANGAME("The Phoenix", "bd6dabf7a19d2ab7902498a8513f8c71", 431643),
- FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 367309),
- FANGAME("Psychotic!", "c7608f67592563b44f2f48fe5fec63ce", 367323), // alt version
- FANGAME("Psychotic!", "51aa5f2744ceb5666c9556bccee797d6", 367429), // another alt version
- FANGAME("Puzzle Piece Search", "6c21c1e0c6afef9300941abd7782dd16", 247693), // From Joshua's Worlds 1.0
- FANGAME("The Puzzle Piece Search", "8fa1d80dd3f1ed69f45d15d774968995", 247338), // From Joshua's Worlds
- FANGAME("The Puzzle Piece Search", "fb839ac4f22427f44e99bcc5afd57a0b", 247324), // Stnadalone
+ FANGAMEN("The Phoenix v1.2", "The Phoenix", "fee9f1de7ad9096d084461d6066192b1", 431384),
+ FANGAME("The Phoenix", "bd6dabf7a19d2ab7902498a8513f8c71", 431387),
+ FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 367053),
+ FANGAME("Psychotic!", "c7608f67592563b44f2f48fe5fec63ce", 367067), // alt version
+ FANGAME("Psychotic!", "51aa5f2744ceb5666c9556bccee797d6", 367173), // another alt version
+ FANGAME("Puzzle Piece Search", "6c21c1e0c6afef9300941abd7782dd16", 247437), // From Joshua's Worlds 1.0
+ FANGAME("The Puzzle Piece Search", "8fa1d80dd3f1ed69f45d15d774968995", 247082), // From Joshua's Worlds
+ FANGAME("The Puzzle Piece Search", "fb839ac4f22427f44e99bcc5afd57a0b", 247068), // Stnadalone
// Empty(?) first scene
- FANGAME("Pyramid of No Return", "4bf4c39b140f5aadb5f8c9a50153d18e", 385145),
+ FANGAME("Pyramid of No Return", "4bf4c39b140f5aadb5f8c9a50153d18e", 384889),
// Cropped graphics at the first scene
- FANGAME("P-W Adventure", "a8e9f97ee02f01de588a4dbabe55ca3f", 219216),
- FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "358b03ea9c978fbfd2ce2833daea00f8", 315783),
- FANGAME("Queen Quest", "7ca009dad76827ce008c3c7fa01cab0a", 57026),
- FANGAME("Queen Quest", "cde1255992101e0763687f45e0f47169", 57039), // alt version
- FANGAME("Quest for T-Rex", "51aa29d24ca702c8980e959706ef0b76", 592584),
- FANGAME("Quest for the Dark Sword", "d98c3879ff20ca7e835e3a630c2c74ef", 572576),
- FANGAME("Radical Castle", "e424dea5542817435b4b6da41fd532cb", 355601),
- FANGAME("Radical Castle 1.0", "7c7701dcab013c65510f97a8712fc419", 347278),
- BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "328096d3c7ccb838956c42b273f17b8e", 1408516),
- BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "401cd46df5e49fa4171ed398b3e0227b", 1408516),
- FANGAME("Ray's World Builder Demo", "eafea10db54530ac6e6128be31741542", 116056),
+ FANGAME("P-W Adventure", "a8e9f97ee02f01de588a4dbabe55ca3f", 218960),
+ FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "358b03ea9c978fbfd2ce2833daea00f8", 315527),
+ FANGAME("Queen Quest", "7ca009dad76827ce008c3c7fa01cab0a", 56770),
+ FANGAME("Queen Quest", "cde1255992101e0763687f45e0f47169", 56783), // alt version
+ FANGAME("Quest for T-Rex", "51aa29d24ca702c8980e959706ef0b76", 592328),
+ FANGAME("Quest for the Dark Sword", "d98c3879ff20ca7e835e3a630c2c74ef", 572320),
+ FANGAME("Radical Castle", "e424dea5542817435b4b6da41fd532cb", 355345),
+ FANGAME("Radical Castle 1.0", "7c7701dcab013c65510f97a8712fc419", 347022),
+ BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "328096d3c7ccb838956c42b273f17b8e", 1408260),
+ BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "401cd46df5e49fa4171ed398b3e0227b", 1408260),
+ FANGAME("Ray's World Builder Demo", "eafea10db54530ac6e6128be31741542", 115800),
// Unhandled comparison case
- FANGAME("Sands of Time", "d065662865d0cb9065812479ed7d2795", 122672), // Original file name "Sands of Time†"
- BIGGAME("scepters", "", "Scepters", "e6c58e96b02f8eb46e0ccfe4f547045b", 346595),
- BIGGAME("scepters", "", "Scepters", "2c824f1bd7b22c575c7be86ac88ebd23", 347540), // alt version
- FANGAME("Schmoozer", "7bbb3d317d2074870c72b28d07984ef8", 221500),
+ FANGAME("Sands of Time", "d065662865d0cb9065812479ed7d2795", 122416), // Original file name "Sands of Time†"
+ BIGGAME("scepters", "", "Scepters", "e6c58e96b02f8eb46e0ccfe4f547045b", 346339),
+ BIGGAME("scepters", "", "Scepters", "2c824f1bd7b22c575c7be86ac88ebd23", 347284), // alt version
+ FANGAME("Schmoozer", "7bbb3d317d2074870c72b28d07984ef8", 221244),
// ??? problems with dog bitmap?
- FANGAMEN("Space Adventure", "SpaceAdventure", "3908c75d639989a28993c59931fbe1ec", 155356),
- FANGAMEN("Space Adventure", "SpaceAdventure", "e38d524cb778ed0beb77ee9299f0ed45", 155356), // alt version
- FANGAMEN("Spear of Destiny", "SpearOfDestiny", "ac00a26f04f83b47c278cc1d226f48df", 333665), // Original file name "SpearOfDestiny†"
- FANGAME("Spear of Destiny", "ea90bddd0925742351340cf88dd1c7a6", 620606), // alt version, normal file name
- FANGAME("Star Trek", "3067332e6f0bb0314579f9bf102e1b56", 53320),
- FANGAME("Strange Disappearance", "9d6e41b61c0fc90400e5da2fcb653a4a", 772282),
- FANGAME("The Sultan's Palace", "fde31cbcc77b66969b4cfcd43075341e", 456855),
- FANGAME("Swamp Witch", "bd8c8394be31f7845d55785b7ccfbbde", 739781), // Original file name "Swamp Witch†"
- FANGAME("Swamp Witch", "07463c8b3b908b0c493a41b949ac1ff5", 740131), // alt version, normal file name
- FANGAME("Sweetspace Now!", "574dc7dd25543f7a516d6524f0c5ab33", 123813), // Comes with Jumble
+ FANGAMEN("Space Adventure", "SpaceAdventure", "3908c75d639989a28993c59931fbe1ec", 155100),
+ FANGAMEN("Space Adventure", "SpaceAdventure", "e38d524cb778ed0beb77ee9299f0ed45", 155100), // alt version
+ FANGAMEN("Spear of Destiny", "SpearOfDestiny", "ac00a26f04f83b47c278cc1d226f48df", 333409), // Original file name "SpearOfDestiny†"
+ FANGAME("Spear of Destiny", "ea90bddd0925742351340cf88dd1c7a6", 620350), // alt version, normal file name
+ FANGAME("Star Trek", "3067332e6f0bb0314579f9bf102e1b56", 53064),
+ FANGAME("Strange Disappearance", "9d6e41b61c0fc90400e5da2fcb653a4a", 772026),
+ FANGAME("The Sultan's Palace", "fde31cbcc77b66969b4cfcd43075341e", 456599),
+ FANGAME("Swamp Witch", "bd8c8394be31f7845d55785b7ccfbbde", 739525), // Original file name "Swamp Witch†"
+ FANGAME("Swamp Witch", "07463c8b3b908b0c493a41b949ac1ff5", 739875), // alt version, normal file name
+ FANGAME("Sweetspace Now!", "574dc7dd25543f7a516d6524f0c5ab33", 123557), // Comes with Jumble
// Wrong scrolling in the first console text
- FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "2ae8f21cfb228ce58ee47b767bdd8820", 234763),
- FANGAME("Time Bomb", "e96f3e2efd1e3db6ad0be22180f5473c", 64564),
- FANGAME("Time Bomb", "976180f9be0d1029aaba7774fec9767c", 64578), // Alt version
+ FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "2ae8f21cfb228ce58ee47b767bdd8820", 234507),
+ FANGAME("Time Bomb", "e96f3e2efd1e3db6ad0be22180f5473c", 64308),
+ FANGAME("Time Bomb", "976180f9be0d1029aaba7774fec9767c", 64322), // Alt version
// Admission for on 3rd screen is messed up
- FANGAME("The Tower", "4cd8755ccb5bbeaf2e5f7848a8daa033", 556539),
+ FANGAME("The Tower", "4cd8755ccb5bbeaf2e5f7848a8daa033", 556283),
// Polygons with ignored byte 1 and 2 on second scene
- FANGAME("The Village", "fd35cad8c61064d6c8aaadab7070ccad", 314828),
- FANGAME("The Wizard's Apprentice", "477c2d2d4672d968dfac1df2acef1dc9", 782824),
+ FANGAME("The Village", "fd35cad8c61064d6c8aaadab7070ccad", 314572),
+ FANGAME("The Wizard's Apprentice", "477c2d2d4672d968dfac1df2acef1dc9", 782568),
// Messed up first scene
- FANGAMEND("Tombworld", "Demo TombWorld", "695734292024290d5d0aa6a66ff628f6", 664252), // Original file name "Demo TombWorld©"
+ FANGAMEND("Tombworld", "Demo TombWorld", "695734292024290d5d0aa6a66ff628f6", 663996), // Original file name "Demo TombWorld©"
// Doesn't go past first scene
- BIGGAME("twisted", "", "Twisted! 1.6", "6e0be4c7d83231e56a431dc4ef7bf978", 960954),
- FANGAME("Volcano II", "7941c08b34bc2408b98c0004c7154aeb", 82991), // Original file name "Volcano II†"
- FANGAME("Wishing Well", "607a66461d65a73c1222d63dbde0175d", 103688),
- FANGAME("Wizard's Warehouse", "18b4678c76961c1f3ae3013e13f691a3", 159748),
- FANGAMEN("Wizard's Warehouse 2", "WizWarehouse 2.0", "e67ac67548236a73897a85cd12b30492", 230870),
- FANGAME("ZikTuria", "a91559e6f04a67dcb9023a98a0faed77", 52972),
- FANGAME("Zoony", "3f7418ea8672ea558521c178188cfce5", 154990), // original filename "Zoonyâ„¢"
- FANGAME("Zoony", "55d3d42b5dca9630eb28ad464f343c67", 154990), // original filename "Zoonyâ„¢", alt version
+ BIGGAME("twisted", "", "Twisted! 1.6", "6e0be4c7d83231e56a431dc4ef7bf978", 960698),
+ FANGAME("Volcano II", "7941c08b34bc2408b98c0004c7154aeb", 82735), // Original file name "Volcano II†"
+ FANGAME("Wishing Well", "607a66461d65a73c1222d63dbde0175d", 103432),
+ FANGAME("Wizard's Warehouse", "18b4678c76961c1f3ae3013e13f691a3", 159492),
+ FANGAMEN("Wizard's Warehouse 2", "WizWarehouse 2.0", "e67ac67548236a73897a85cd12b30492", 230614),
+ FANGAME("ZikTuria", "a91559e6f04a67dcb9023a98a0faed77", 52716),
+ FANGAME("Zoony", "3f7418ea8672ea558521c178188cfce5", 154734), // original filename "Zoonyâ„¢"
+ FANGAME("Zoony", "55d3d42b5dca9630eb28ad464f343c67", 154734), // original filename "Zoonyâ„¢", alt version
#if 0
// These are TODO
Commit: 401126f9f7ab170d90539e707dc5809133a03b32
https://github.com/scummvm/scummvm/commit/401126f9f7ab170d90539e707dc5809133a03b32
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
DIRECTOR: Disable detection entry with invalid punycode
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 7b5d1a4395..a8d6d32a4e 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2741,7 +2741,7 @@ static const DirectorGameDescription gameDescriptions[] = {
// Original Japanese demo filename is Buried in Timeâ„¢ Demo
MACGAME1("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 80334, 400),
MACGAME1_l("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 86324, Common::DE_DEU, 400),
- MACDEMO1_l("jman2", "Demo", "xn--Buried in Time Demo-yp97h", "cdb27c916044ae4dceb4b7326063fa03", 329851, Common::JA_JPN, 400),
+// MACDEMO1_l("jman2", "Demo", "xn--Buried in Time Demo-yp97h", "cdb27c916044ae4dceb4b7326063fa03", 329851, Common::JA_JPN, 400),
MACDEMO1("jman2", "Demo", "Buried in Time Demo", "1ae45c23586b41997ba52e2e7c771c4c", 437743, 400),
MACDEMO1("jman2", "06/22/94 Demo", "Buried in Time Demo", "cdb27c916044ae4dceb4b7326063fa03", 328895, 400),
MACDEMO1("jman2", "Final Demo", "Buried in Time Demo", "cc3321069072b90f091f220bba16e4d4", 292731, 400),
Commit: 37f0024b0a56a0fb34b851f6e97cb306a01ac39b
https://github.com/scummvm/scummvm/commit/37f0024b0a56a0fb34b851f6e97cb306a01ac39b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
MACVENTURE: Adjust detection entries after MacResMan bugfix
Changed paths:
engines/macventure/detection.cpp
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index 39d923d03b..e5d895f547 100644
--- a/engines/macventure/detection.cpp
+++ b/engines/macventure/detection.cpp
@@ -33,10 +33,10 @@ namespace MacVenture {
#define BASEDEMO(n, v, f, md5, s) {n, v, AD_ENTRY1s(f, md5, s), Common::EN_ANY, Common::kPlatformMacintosh, ADGF_DEFAULT|ADGF_DEMO, GUIO1(GUIO_NOMIDI)}
static const ADGameDescription gameDescriptions[] = {
- BASEGAME("shadowgate", "Zojoi Rerelease", "Shadowgate.bin", "ebbfbcbf93938bd2900cb0c0213b19ad", 68974), // Zojoi Rerelease
- BASEGAME("deja_vu", "Zojoi Rerelease", "Deja Vu.bin", "5e9f5a8e3c8eb29ed02b34ae5937354f", 69034), // Zojoi Rerelease
- BASEGAME("deja_vu2", "Zojoi Rerelease", "Lost in Las Vegas.bin", "8f8e1d8d41f577ee0fbc03847969af0d", 66520), // Zojoi Rerelease
- BASEDEMO("uninvited", "Demo", "Uninvited Demo", "e53adca77d773dca926f61faac68df86", 53375),
+ BASEGAME("shadowgate", "Zojoi Rerelease", "Shadowgate", "ebbfbcbf93938bd2900cb0c0213b19ad", 68718), // Zojoi Rerelease
+ BASEGAME("deja_vu", "Zojoi Rerelease", "Deja Vu", "5e9f5a8e3c8eb29ed02b34ae5937354f", 68778), // Zojoi Rerelease
+ BASEGAME("deja_vu2", "Zojoi Rerelease", "Lost in Las Vegas", "8f8e1d8d41f577ee0fbc03847969af0d", 66264), // Zojoi Rerelease
+ BASEDEMO("uninvited", "Demo", "Uninvited Demo", "e53adca77d773dca926f61faac68df86", 53119),
AD_TABLE_END_MARKER
};
Commit: 8676f4b2fe525326ecc15a4a0f3eae3e01f6f494
https://github.com/scummvm/scummvm/commit/8676f4b2fe525326ecc15a4a0f3eae3e01f6f494
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
DIRECTOR: Fix preloadCast without arguments
Changed paths:
engines/director/lingo/lingo-builtins.cpp
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 2ba02dfb5b..8f6fd10e90 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1331,7 +1331,11 @@ void LB::b_preLoadCast(int nargs) {
// We always pretend we preloaded all cast
// Returning the number of the last cast successfully "loaded"
- g_lingo->_theResult = g_lingo->pop();
+ if (nargs > 1) {
+ g_lingo->_theResult = g_lingo->pop();
+ } else {
+ g_lingo->_theResult = 1;
+ }
if (nargs == 2)
g_lingo->pop();
Commit: c65768931bf831c72ac56a97847271aaf1bbc898
https://github.com/scummvm/scummvm/commit/c65768931bf831c72ac56a97847271aaf1bbc898
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:02+03:00
Commit Message:
DIRECTOR: Disabled entry with incorrect punycode
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index a8d6d32a4e..7b5d1a4395 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2741,7 +2741,7 @@ static const DirectorGameDescription gameDescriptions[] = {
// Original Japanese demo filename is Buried in Timeâ„¢ Demo
MACGAME1("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 80334, 400),
MACGAME1_l("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 86324, Common::DE_DEU, 400),
-// MACDEMO1_l("jman2", "Demo", "xn--Buried in Time Demo-yp97h", "cdb27c916044ae4dceb4b7326063fa03", 329851, Common::JA_JPN, 400),
+ MACDEMO1_l("jman2", "Demo", "xn--Buried in Time Demo-yp97h", "cdb27c916044ae4dceb4b7326063fa03", 329851, Common::JA_JPN, 400),
MACDEMO1("jman2", "Demo", "Buried in Time Demo", "1ae45c23586b41997ba52e2e7c771c4c", 437743, 400),
MACDEMO1("jman2", "06/22/94 Demo", "Buried in Time Demo", "cdb27c916044ae4dceb4b7326063fa03", 328895, 400),
MACDEMO1("jman2", "Final Demo", "Buried in Time Demo", "cc3321069072b90f091f220bba16e4d4", 292731, 400),
Commit: ed0b5042f38506d583c112f665bcb25e63b53aed
https://github.com/scummvm/scummvm/commit/ed0b5042f38506d583c112f665bcb25e63b53aed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
DIRECTOR: Changed The Apartment Mac detection after the MacResMan changes
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 7b5d1a4395..124f7d81f8 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1248,8 +1248,8 @@ static const DirectorGameDescription gameDescriptions[] = {
},
// Original filename is "•Main Menu" for all
- MACGAME1("theapartment", "D2", "xn--Main Menu-zd0e", "fc56c179cb8c6d4938e61ee61fd0032c", 48325, 200),
- MACGAME1("theapartment", "D3", "xn--Main Menu-zd0e", "9e838fe1a6af7992d656ca325e38dee5", 47911, 300),
+ MACGAME1("theapartment", "D2", "xn--Main Menu-zd0e", "fc56c179cb8c6d4938e61ee61fd0032c", 48069, 200),
+ MACGAME1("theapartment", "D3", "xn--Main Menu-zd0e", "9e838fe1a6af7992d656ca325e38dee5", 47655, 300),
MACGAME1("theapartment", "D4", "xn--Main Menu-zd0e", "ff86181f03fe6eb060f65a985ca0580d", 160612, 400),
//////////////////////////////////////////////////
Commit: 33115992a050c878a4e4ae39f53367571fc70dd8
https://github.com/scummvm/scummvm/commit/33115992a050c878a4e4ae39f53367571fc70dd8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
STARTREK: Fix Mac version detection entry after MacResMan changes
Changed paths:
engines/startrek/detection.cpp
diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index b51bbb36d8..b77c70a3cf 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -165,7 +165,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
{
"st25",
"Floppy",
- AD_ENTRY1s("Star Trek Data", "d95eb00532b7082d53862c906c7ac3dc", 39032),
+ AD_ENTRY1s("Star Trek Data", "d95eb00532b7082d53862c906c7ac3dc", 38776),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_UNSTABLE,
Commit: ac4476f5551a7fae960d282493c094e562c7fead
https://github.com/scummvm/scummvm/commit/ac4476f5551a7fae960d282493c094e562c7fead
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
PEGASUS: Marked invalid Mac detection entries after MacResMan changes
Changed paths:
engines/pegasus/detection.cpp
diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp
index 3eafcd4db0..8141914dba 100644
--- a/engines/pegasus/detection.cpp
+++ b/engines/pegasus/detection.cpp
@@ -41,7 +41,7 @@ static const PegasusGameDescription gameDescriptions[] = {
{
"pegasus",
"",
- AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2009943),
+ AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2009943), // FIXMEMD5
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -53,7 +53,7 @@ static const PegasusGameDescription gameDescriptions[] = {
{
"pegasus",
"DVD",
- AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075337),
+ AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075337), // FIXMEMD5
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK|GF_DVD,
@@ -64,7 +64,7 @@ static const PegasusGameDescription gameDescriptions[] = {
{
{ "pegasus",
"DVD",
- AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075337),
+ AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075337), // FIXMEMD5
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_MACRESFORK|GF_DVD,
@@ -92,7 +92,7 @@ static const PegasusGameDescription gameDescriptions[] = {
{
"pegasus",
"v1.0 Demo",
- AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 365585),
+ AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 365585), // FIXMEMD5
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_DEMO,
@@ -107,7 +107,7 @@ static const PegasusGameDescription gameDescriptions[] = {
{
"pegasus",
"Demo",
- AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 360129),
+ AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 360129), // FIXMEMD5
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_DEMO,
@@ -119,7 +119,7 @@ static const PegasusGameDescription gameDescriptions[] = {
{
"pegasus",
"DVD Demo",
- AD_ENTRY1s("JMP PP Resources", "d0fcda50dc75c7a81ae314e6a813f4d2", 93495),
+ AD_ENTRY1s("JMP PP Resources", "d0fcda50dc75c7a81ae314e6a813f4d2", 93495), // FIXMEMD5
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_DEMO | GF_DVD,
Commit: 521b5b7a2dbbb5a3664b5137a58105382d23522f
https://github.com/scummvm/scummvm/commit/521b5b7a2dbbb5a3664b5137a58105382d23522f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
SCI: Updated few Mac detection entries and marked the rest after MacResMan changes
Changed paths:
engines/sci/detection_tables.h
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 835da72a35..5202c84340 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -779,8 +779,8 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Freddy Pharkas - English Macintosh
{"freddypharkas", "", {
- {"Data1", 0, "ef7cbd62727989818f1cfae69c9fd61d", 3038492},
- {"Data2", 0, "2424b418f7d52c385cea4701f529c69a", 4721732},
+ {"Data1", 0, "ef7cbd62727989818f1cfae69c9fd61d", 3038236},
+ {"Data2", 0, "2424b418f7d52c385cea4701f529c69a", 4721476},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_STD16_MAC },
@@ -931,7 +931,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// (which is meant for enforcing hi-res graphics), but instead hi-res mode should be enabled all the time.
// Confirmed by [md5] and originally by clone2727.
{"gk1", "", {
- {"Data1", 0, "044d3bcd7e5b5bb0393d954ade8053fe", 5814918},
+ {"Data1", 0, "044d3bcd7e5b5bb0393d954ade8053fe", 5814918}, // FIXMEMD5
{"Data2", 0, "99a0c63febf9e44e12a00f99c00eae0f", 6685352},
{"Data3", 0, "f25068b408b09275d8b698866462f578", 3677599},
{"Data4", 0, "1cceebbe411b26c860a74f91c337fdf3", 3230086},
@@ -1069,7 +1069,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// NOTE: This only contains disc 1 files (as well as the persistent file:
// Data1. Other discs have conflicting names :(
{"gk2", "", {
- {"Data1", 0, "81cb3b4461af845efc59450a74b49fe6", 693041},
+ {"Data1", 0, "81cb3b4461af845efc59450a74b49fe6", 693041}, // FIXMEMD5
{"Data2", 0, "69a05445a7c8c2da06d8f5a70200974d", 16774575},
{"Data3", 0, "256309284f6447aaa5028103753e7e78", 15451830},
{"Data4", 0, "8b843c62eb53136a855d6e0087e3cb0d", 5889553},
@@ -1304,7 +1304,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// VERSION file reports "2.0"
// Although this is a floppy game, it does have speech. (bug #13007)
{"hoyle4", "", {
- {"Data1", 0, "99575fae4579540a314bbedd72d51e8c", 7682887},
+ {"Data1", 0, "99575fae4579540a314bbedd72d51e8c", 7682887}, // FIXMEMD5
{"Data2", 0, "7d4bf5bdf3c02edbf35cb8471c84ec13", 1539134},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_STD16_MAC_SPEECH },
@@ -1382,9 +1382,9 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Hoyle 5 (Hoyle Classic Games) - Macintosh CD
// VERSION file reports "1.000.000"
{"hoyle5", "", {
- {"Data1", 0, "b280fbcdb1e0fa9d708e1f8d6050ef2d", 553372},
- {"Data2", 0, "a1b4d73bc7672e4db2665657911fc5f2", 14429682},
- {"Data3", 0, "65f9b79f2f8904a6277c8e6ee4fd7ac0", 75704},
+ {"Data1", 0, "b280fbcdb1e0fa9d708e1f8d6050ef2d", 553116},
+ {"Data2", 0, "a1b4d73bc7672e4db2665657911fc5f2", 14429426},
+ {"Data3", 0, "65f9b79f2f8904a6277c8e6ee4fd7ac0", 75448},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_HOYLE5_SAVELOAD },
@@ -2153,7 +2153,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// King's Quest 6 - English Macintosh Floppy
// VERSION file reports "1.0"
{"kq6", "", {
- {"Data1", 0, "a183fc0c22fcbd9be4c8800d974b5599", 3892124},
+ {"Data1", 0, "a183fc0c22fcbd9be4c8800d974b5599", 3892124}, // FIXMEMD5
{"Data2", 0, "b3722460dfd3097a1fbaf99a21ad8ea5", 15031272},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_STD16_MAC },
@@ -2329,7 +2329,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// King's Quest 7 - English Macintosh
{"kq7", "", {
- {"Data1", 0, "e0d120473fee7a548b1418b18bffbd7d", 4964646},
+ {"Data1", 0, "e0d120473fee7a548b1418b18bffbd7d", 4964646}, // FIXMEMD5
{"Data2", 0, "a260b97fb2396a9cd6ac3df6a56a2499", 14645782},
{"Data3", 0, "a5a660a469c9ba7b179ba9757181d2af", 6664388},
{"Data4", 0, "556721a5e3f158c0a7a39e428402dd1f", 6438951},
@@ -2626,7 +2626,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Lighthouse - English Macintosh CD
// NOTE: This only contains disc 1 files
{ "lighthouse", "", {
- {"Data1", 0, "9fd95df4288bcc5f07b114bbeabaa89a", 7498955},
+ {"Data1", 0, "9fd95df4288bcc5f07b114bbeabaa89a", 7498955}, // FIXMEMD5
{"Data2", 0, "97a5c80a12eee099349748a72b9f561a", 11278999},
{"Data3", 0, "51085a80ec0f448938d279dc3464e1b1", 8295799},
{"Data4", 0, "8c01d5243c62868207c144125de46c5a", 9132628},
@@ -3253,7 +3253,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Larry 6 - English Macintosh Floppy (provided by sluicebox)
// VERSION file reports "1.0"
{"lsl6", "", {
- {"Data1", 0, "482e6bcdda3a89390d5c4bcbfb5896b4", 2754907},
+ {"Data1", 0, "482e6bcdda3a89390d5c4bcbfb5896b4", 2754907}, // FIXMEMD5
{"Data2", 0, "ba0799a45076780dfbceb8fce4c549c9", 5846345},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_STD16_MAC },
@@ -3334,7 +3334,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Larry 6 - English Macintosh CD - HIRES (provided by michaelklaube in bug report #11218)
{"lsl6hires", "Hi-res", {
- {"Data1", 0, "2c4e00a6910490831d4d84e9e6a49ec4", 3456494},
+ {"Data1", 0, "2c4e00a6910490831d4d84e9e6a49ec4", 3456494}, // FIXMEMD5
{"Data2", 0, "a7522b925dd5422c2db2b0a2337c76c3", 5856678},
{"Data3", 0, "9ebb490ec63721e5261111b918b5520e", 5577998},
{"Data4", 0, "d70687689ff3cf19a5e3c79dfced1c94", 3472320},
@@ -3430,7 +3430,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Larry 7 - English Macintosh CD
{"lsl7", "", {
- {"Data1", 0, "824a48b794c334b4bcf37e80fcc5f82e", 913286},
+ {"Data1", 0, "824a48b794c334b4bcf37e80fcc5f82e", 913286}, // FIXMEMD5
{"Data2", 0, "be36c59a3a694e14ed6d86e6ccc180a4", 7549943},
{"Data3", 0, "8325c7d702ffa8dd2854135e0f42b0d0", 6815697},
{"Data4", 0, "4584f786e0b5a502938d3cd90e6fab56", 8169195},
@@ -3585,11 +3585,11 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Mixed-Up Mother Goose Deluxe - English Macintosh CD
{ "mothergoosehires", "",{
- {"Data1", 0, "8a7ef3307d80adcd393c012f78a4e1d7", 609389},
- {"Data2", 0, "94e72a735be859cac3cdf084497a03c7", 5550743},
- {"Data3", 0, "4819cca5624615fcdd8838605661cd77", 5362685},
- {"Data4", 0, "ea260cdb42405649136b08bdac45c708", 6368421},
- {"Data5", 0, "eb5d6c76c69acafbbafa9e75b65f1da8", 3522384},
+ {"Data1", 0, "8a7ef3307d80adcd393c012f78a4e1d7", 609133},
+ {"Data2", 0, "94e72a735be859cac3cdf084497a03c7", 5550487},
+ {"Data3", 0, "4819cca5624615fcdd8838605661cd77", 5362429},
+ {"Data4", 0, "ea260cdb42405649136b08bdac45c708", 6368165},
+ {"Data5", 0, "eb5d6c76c69acafbbafa9e75b65f1da8", 3522128},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_MOTHERGOOSEHIRES },
@@ -3773,7 +3773,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Data1 and Data13. Other discs have conflicting names :(
// Game script sets version to "1.000.000"
{"phantasmagoria", "", {
- {"Data1", 0, "0fcb42802f49edb5af60532bd7b60c4f", 14705669},
+ {"Data1", 0, "0fcb42802f49edb5af60532bd7b60c4f", 14705669}, // FIXMEMD5
{"Data2", 0, "d52f612058ec78e300385df3336a4ba2", 14516712},
{"Data3", 0, "d6880c00d2c700c213ab76a3c39e60fc", 15612610},
{"Data4", 0, "9037f5d3a37d0ee23146d9830726b058", 9794705},
@@ -4213,7 +4213,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Police Quest 4 - English Macintosh CD
{"pq4", "", {
- {"Data1", 0, "9f0a775c66481cef43b0743275a745b7", 4946164},
+ {"Data1", 0, "9f0a775c66481cef43b0743275a745b7", 4946164}, // FIXMEMD5
{"Data2", 0, "e64840cdc341ac567579aae1526e6d92", 5572355},
{"Data3", 0, "abdd183f3d6a0c326c949ba9dda32579", 5691679},
{"Data4", 0, "f1d80305b254f40ecff4a0f56b1d21a7", 5431778},
@@ -4307,7 +4307,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Police Quest: SWAT - English Macintosh CD
// NOTE: This only contains disc 1 files
{"pqswat", "", {
- {"Data1", 0, "03f10959f32a894a65385dfee19022fa", 842362},
+ {"Data1", 0, "03f10959f32a894a65385dfee19022fa", 842362}, // FIXMEMD5
{"Data2", 0, "9f6975e06881ccf594d1d2011c8fac69", 8572333},
{"Data3", 0, "80ac4ba29e1c6a6abeef06566c389028", 9785485},
{"Data4", 0, "450e87b388e3b759b68c6ceb6bb4ca89", 10271339},
@@ -4515,7 +4515,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Quest for Glory 1 VGA Remake - English Macintosh Floppy
// VERSION file reports "2.0"
{"qfg1vga", "VGA", {
- {"Data1", 0, "106527ff8756e4e1a795d63d23e8b833", 1752358},
+ {"Data1", 0, "106527ff8756e4e1a795d63d23e8b833", 1752358}, // FIXMEMD5
{"Data2", 0, "5cdd92033231159c6e9c71d43e9f194d", 6574746},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO_STD16_MAC },
@@ -4828,7 +4828,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// RAMA - English Macintosh CD
// NOTE: This only contains disc 1 files
{"rama", "", {
- { "Data1", 0, "6013a1ea890f831c3ff05cdda4b4bcc0", 805865 },
+ { "Data1", 0, "6013a1ea890f831c3ff05cdda4b4bcc0", 805865 }, // FIXMEMD5
{ "Data2", 0, "242362ae1ecfbda37b31a952b25303e9", 8570826 },
{ "Data3", 0, "1ee46ff2d7f02bf46ec0c4aa8f84cbb4", 10692344 },
{ "Data4", 0, "15519ad5d8d7f12db08e1a91a762c237", 6780250 },
@@ -4906,7 +4906,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Shivers - English Macintosh CD
{"shivers", "", {
- {"Data1", 0, "7154f2fc5466f0cd6923deb1a6f6729a", 4635483},
+ {"Data1", 0, "7154f2fc5466f0cd6923deb1a6f6729a", 4635483}, // FIXMEMD5
{"Data2", 0, "499e46f2b9d1c1485eca53cb90d60a18", 518575},
{"Data3", 0, "8f874e8207f3bf0f1d089fb3af01c1ad", 10159733},
{"Data4", 0, "af5e6582a7157eb2a8784fa7098cf1b1", 15479074},
@@ -4978,7 +4978,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Slater & Charlie Go Camping - English Macintosh
{"slater", "", {
- {"Data1", 0, "7243b4390e5f0182d8133fbcae4b50c5", 2298853},
+ {"Data1", 0, "7243b4390e5f0182d8133fbcae4b50c5", 2298853}, // FIXMEMD5
{"Data2", 0, "6b6f18f9b502dc0923eeae0ef47f02d5", 2276956},
AD_LISTEND},
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO1(GUIO_NONE) },
@@ -5680,7 +5680,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Space Quest 6 - English Macintosh CD
// VERSION file reports "1.000"
{"sq6", "", {
- {"Data1", 0, "37d452ef82e3c054a2531d3028acbd9a", 11488588},
+ {"Data1", 0, "37d452ef82e3c054a2531d3028acbd9a", 11488588}, // FIXMEMD5
{"Data2", 0, "c4d2da963e1ae9f52bac4bece8ecef19", 6912519},
{"Data3", 0, "d1ee854dc7ac5e439aaaed683404dd53", 5527552},
{"Data4", 0, "4126aa73958a00203e97f843e888d82b", 5872808},
@@ -5867,7 +5867,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
// Torin's Passage - English Macintosh
{"torin", "", {
- {"Data1", 0, "63887e33cc282c92dc1f916f54aea8eb", 700786},
+ {"Data1", 0, "63887e33cc282c92dc1f916f54aea8eb", 700786}, // FIXMEMD5
{"Data2", 0, "da2f13be2819a7333fee372d38b8d1a2", 122485},
{"Data3", 0, "e9fda4f1714ddb443545ba8a2d58ef18", 7299126},
{"Data4", 0, "59b432ec35b24a216432a556e25087ef", 7209309},
Commit: aca4e2fd43e9e2b420025b661b2e359e7b34b3bd
https://github.com/scummvm/scummvm/commit/aca4e2fd43e9e2b420025b661b2e359e7b34b3bd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
GROOVIE: Marked detection entry invalidated by MacResMan changes
Changed paths:
engines/groovie/detection.cpp
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 4d6755422c..e162bb9e04 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -60,7 +60,7 @@ static const PlainGameDescriptor groovieGames[] = {
static const GroovieGameDescription gameDescriptions[] = {
// groovie.cpp requires the first file to be the main .grv file for v2 games, might as well stick to that convention for v1 games from now on too
-
+
// The 7th Guest DOS English
{
{
@@ -76,7 +76,7 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"t7g", "",
- AD_ENTRY2s("script.grv", NULL, -1,
+ AD_ENTRY2s("script.grv", NULL, -1, // FIXMEMD5
"T7GMac", "acdc4a58dd3f007f65e99b99d78e0bce", 1814029),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK,
GUIO7(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT, GUIO_NOSFX, GAMEOPTION_T7G_FAST_MOVIE_SPEED, GAMEOPTION_ORIGINAL_SAVELOAD)
Commit: 52b7d0b0c3b57ecf33bb4a62ad4abf851dd1ec88
https://github.com/scummvm/scummvm/commit/52b7d0b0c3b57ecf33bb4a62ad4abf851dd1ec88
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
HADESCH: Marked detection entry invalidated by MacResMan changes
Changed paths:
engines/hadesch/detection_tables.h
diff --git a/engines/hadesch/detection_tables.h b/engines/hadesch/detection_tables.h
index 8573d9f13f..a5dfc1d57f 100644
--- a/engines/hadesch/detection_tables.h
+++ b/engines/hadesch/detection_tables.h
@@ -48,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = {
"hadesch",
0,
{
- {"Hades Challenge PPC", 0, "c7213a365a3cab7e9f2b423fa4a204f5", 1724646},
+ {"Hades Challenge PPC", 0, "c7213a365a3cab7e9f2b423fa4a204f5", 1724646}, // FIXMEMD5
{"WD.POD", 0, "be7030fc4229e69e719ee2c756eb6ba1", 7479768},
{"ol.pod", 0, "7cabba8d1d4f1239e312e045ef4e9735", 5621074},
AD_LISTEND
Commit: 0f9b4ef305a9ead25864cbc68ac019c64decbe7a
https://github.com/scummvm/scummvm/commit/0f9b4ef305a9ead25864cbc68ac019c64decbe7a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
AD: Added more debug output
Changed paths:
engines/advancedDetector.cpp
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 267ae63024..e68ef492da 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -580,7 +580,7 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
FileProperties tmp;
if (getFileProperties(allFiles, *g, fname, tmp)) {
- debugC(3, kDebugGlobalDetection, "> '%s': '%s'", fname.c_str(), tmp.md5.c_str());
+ debugC(3, kDebugGlobalDetection, "> '%s': '%s' %ld", fname.c_str(), tmp.md5.c_str(), tmp.size);
}
// Both positive and negative results are cached to avoid
@@ -633,7 +633,7 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
}
if (fileDesc->fileSize != -1 && fileDesc->fileSize != filesProps[tstr].size) {
- debugC(3, kDebugGlobalDetection, "Size Mismatch. Skipping");
+ debugC(3, kDebugGlobalDetection, "Size Mismatch. Skipping (%ld) (%ld)", fileDesc->fileSize, filesProps[tstr].size);
game.hasUnknownFiles = true;
continue;
}
Commit: d33ef146aefb004b7a9beea50f9634652341fed5
https://github.com/scummvm/scummvm/commit/d33ef146aefb004b7a9beea50f9634652341fed5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
MADE: Fixed detection entry after MacResMan changes
Changed paths:
engines/made/detection_tables.h
diff --git a/engines/made/detection_tables.h b/engines/made/detection_tables.h
index 537c70cd6a..c99689c26e 100644
--- a/engines/made/detection_tables.h
+++ b/engines/made/detection_tables.h
@@ -367,7 +367,7 @@ static const MadeGameDescription gameDescriptions[] = {
{
"rtz",
"V1.2, 5/4/94, Demo CD",
- AD_ENTRY1s("Return To Zork", "0c1377afd4b6fc4ee900e1882ac13895", 1714320),
+ AD_ENTRY1s("Return To Zork", "0c1377afd4b6fc4ee900e1882ac13895", 1714064),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_DEMO | ADGF_CD | ADGF_MACRESFORK,
Commit: 1c714952cee9aad7181d484f75502d88a53d491b
https://github.com/scummvm/scummvm/commit/1c714952cee9aad7181d484f75502d88a53d491b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-17T20:48:03+03:00
Commit Message:
HADESCH: Fixed Mac entry after MacResMan changes
Changed paths:
engines/hadesch/detection_tables.h
diff --git a/engines/hadesch/detection_tables.h b/engines/hadesch/detection_tables.h
index a5dfc1d57f..bbe64f1456 100644
--- a/engines/hadesch/detection_tables.h
+++ b/engines/hadesch/detection_tables.h
@@ -48,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = {
"hadesch",
0,
{
- {"Hades Challenge PPC", 0, "c7213a365a3cab7e9f2b423fa4a204f5", 1724646}, // FIXMEMD5
+ {"Hades Challenge PPC", 0, "0a1dd550e5efe7f36370e689811fac73", 28945},
{"WD.POD", 0, "be7030fc4229e69e719ee2c756eb6ba1", 7479768},
{"ol.pod", 0, "7cabba8d1d4f1239e312e045ef4e9735", 5621074},
AD_LISTEND
More information about the Scummvm-git-logs
mailing list