aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm/script_v72he.cpp16
-rw-r--r--scumm/scumm-md5.h10
-rw-r--r--scumm/scumm.cpp10
-rw-r--r--scumm/scumm.h3
-rw-r--r--tools/scumm-md5.txt8
5 files changed, 27 insertions, 20 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 5b0812b4bb..bc8fbbcfab 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1762,11 +1762,17 @@ void ScummEngine_v72he::o72_openFile() {
// There are Macintosh specific versions of HE7.2 games.
if (_heversion >= 80 && _platform == Common::kPlatformMacintosh) {
- char buf1[128];
- buf1[0] = '\0';
- generateSubstResFileName((char *)filename, buf1, sizeof(buf1));
- if (buf1[0]) {
- strcpy((char *)filename, buf1);
+ // Work around for filename difference in HE7 file, needs to
+ // open 'Water (7)' instead of 'Water Worries (7)'.
+ if (_gameId == GID_WATER && _heversion == 99 && !strcmp((char *)filename, "Water.he7")) {
+ strcpy((char *)filename, "Water (7)");
+ } else {
+ char buf1[128];
+ buf1[0] = '\0';
+ generateSubstResFileName((char *)filename, buf1, sizeof(buf1));
+ if (buf1[0]) {
+ strcpy((char *)filename, buf1);
+ }
}
}
diff --git a/scumm/scumm-md5.h b/scumm/scumm-md5.h
index 9f00957f53..44087a7e9a 100644
--- a/scumm/scumm-md5.h
+++ b/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Sat Dec 03 00:13:08 2005
+ This file was generated by the md5table tool on Sat Dec 03 00:45:58 2005
DO NOT EDIT MANUALLY!
*/
@@ -31,7 +31,7 @@ static const MD5Table md5table[] = {
{ "0ab19be9e2a3f6938226638b2a3744fe", "PuttTime", Common::EN_USA, Common::kPlatformUnknown },
{ "0ac41e2e3d2174e5a042a6b565328dba", "puttrace", Common::EN_USA, Common::kPlatformUnknown },
{ "0b3222aaa7efcf283eb621e0cefd26cc", "puttputt", Common::RU_RUS, Common::kPlatformPC },
- { "0c45eb4baff0c12c3d9dfa889c8070ab", "pajama3", Common::DE_DEU, Common::kPlatformWindows },
+ { "0c45eb4baff0c12c3d9dfa889c8070ab", "pajama3", Common::DE_DEU, Common::kPlatformUnknown },
{ "0cccfa5223099a60e76cfcca57a1a141", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
{ "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", Common::ES_ESP, Common::kPlatformPC },
{ "0e4c5d54a0ad4b26132e78b5ea76642a", "samnmax", Common::EN_USA, Common::kPlatformPC },
@@ -192,13 +192,13 @@ static const MD5Table md5table[] = {
{ "63fdcdc95cdeea00060883aed38e5504", "PuttTime", Common::EN_USA, Common::kPlatformWindows },
{ "6508fd55530e6915507e1cc37f7f045d", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "66236cd1aec24e1d4aff4c4cc93b7e18", "indy3", Common::FR_FRA, Common::kPlatformPC },
- { "663743c03ae0c007f3d665cf631c0e6b", "puttrace", Common::DE_DEU, Common::kPlatformWindows },
+ { "663743c03ae0c007f3d665cf631c0e6b", "puttrace", Common::DE_DEU, Common::kPlatformUnknown },
{ "66fd5ff9a810dfeb6d6bdada18221140", "monkey", Common::IT_ITA, Common::kPlatformPC },
{ "672dec94b82f7f0877ebb5b5cf7f4bc1", "pajama", Common::EN_USA, Common::kPlatformUnknown },
{ "675d71151e9b5a968c8ce46d9fbf4cbf", "zak", Common::EN_USA, Common::kPlatformPC },
{ "68155a6bf082221525f431c2cbdac8ab", "SamsFunShop", Common::EN_USA, Common::kPlatformUnknown },
{ "684732efb5799c0f78804c99d8de9aba", "puttputt", Common::EN_USA, Common::kPlatformMacintosh },
- { "688328c5bdc4c8ec4145688dfa077bf2", "freddi4", Common::DE_DEU, Common::kPlatformWindows },
+ { "688328c5bdc4c8ec4145688dfa077bf2", "freddi4", Common::DE_DEU, Common::kPlatformUnknown },
{ "6886e5d08cee329b1f2e743ae2e3ceed", "monkey2", Common::DE_DEU, Common::kPlatformPC },
{ "695fe0b3963333b7e15b37514db3c745", "thinkerk", Common::EN_USA, Common::kPlatformUnknown },
{ "697c9b7c55a05d8199c48b48e379d2c8", "puttmoon", Common::HB_ISR, Common::kPlatformPC },
@@ -223,7 +223,7 @@ static const MD5Table md5table[] = {
{ "71fe97c3108678cf604f14abe342341b", "spyfox2", Common::NL_NLD, Common::kPlatformWindows },
{ "7222f260253f325c21fcfa68b5bfab67", "spyfox2", Common::EN_USA, Common::kPlatformUnknown },
{ "72ac6bc980d5101c2142189d746bd62f", "spyfox", Common::RU_RUS, Common::kPlatformWindows },
- { "732845548b1d6c2da572cb6a1bf81b07", "spyfox2", Common::DE_DEU, Common::kPlatformWindows },
+ { "732845548b1d6c2da572cb6a1bf81b07", "spyfox2", Common::DE_DEU, Common::kPlatformUnknown },
{ "73e5ab7dbb9a8061cc6d25df02dbd1e7", "loom", Common::EN_USA, Common::kPlatformPC },
{ "746e88c172a5b7a1ae89ac0ee3ee681a", "freddi", Common::RU_RUS, Common::kPlatformWindows },
{ "754feb59d3bf86b8a00840df74fd7b26", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 075c1a7357..e523af6c39 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -266,7 +266,7 @@ static const ScummGameSettings scumm_settings[] = {
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
{"socks", "Pajama Sam's Sock Works", GID_HEGAME, 6, 80, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
- {"water", "Freddi Fish and Luther's Water Worries", GID_HEGAME, 6, 80, MDT_NONE,
+ {"water", "Freddi Fish and Luther's Water Worries", GID_WATER, 6, 80, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
// Humongous Entertainment Scumm Version 9.0 ? Scummsys.90
@@ -443,7 +443,7 @@ static const ScummGameSettings multiple_versions_md5_settings[] = {
{"4dbff3787aedcd96b0b325f2d92d7ad9", "Freddi Fish and Luther's Maze Madness (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
- {"f1b0e0d587b85052de5534a3847e68fe", "Freddi Fish and Luther's Water Worries (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
+ {"f1b0e0d587b85052de5534a3847e68fe", "Freddi Fish and Luther's Water Worries (Updated)", GID_WATER, 6, 99, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
{"9d7b67be003fea60be4dcbd193611936", "Full Throttle (Mac Demo)", GID_FT, 7, 0, MDT_NONE,
@@ -779,7 +779,7 @@ static SubstResFileNames substResFileNameTable[] = {
{ "freddi4", "f4-demo", kGenPC },
{ "freddi4", "ff4demo", kGenPC },
{ "freddi4", "Freddi 4 Demo", kGenMac },
- { "freddi4", "ff4demo", kGenMac },
+ { "freddi4", "Ff4demo", kGenMac },
{ "freddi4", "Freddi 4", kGenMac },
{ "freddi4", "FreddiGS", kGenPC },
{ "freddi4", "FreddiHRBG", kGenPC },
@@ -812,7 +812,7 @@ static SubstResFileNames substResFileNameTable[] = {
{ "pajama3", "Pajama Sam 3-Demo", kGenMac },
{ "pajama3", "pj3-demo", kGenPC },
{ "pajama3", "pj3demo", kGenPC },
- { "pajama3", "pj3demo", kGenMac },
+ { "pajama3", "PJ3Demo", kGenMac },
{ "pajama3", "Pajama Sam Demo", kGenMac },
{ "pajama3", "PjSamDemo", kGenMac },
{ "pajama3", "PjSamDemo", kGenPC },
@@ -831,7 +831,6 @@ static SubstResFileNames substResFileNameTable[] = {
{ "puttrace", "500demo", kGenPC },
{ "puttrace", "racedemo", kGenPC },
{ "puttrace", "RaceDemo", kGenMac },
- { "puttrace", "racedemo", kGenMac },
{ "puttrace", "Rennen", kGenPC },
{ "puttrace", "Putt500 demo", kGenMac }, // NL Mac demo
{ "puttrace", "Putt Race", kGenMac },
@@ -869,6 +868,7 @@ static SubstResFileNames substResFileNameTable[] = {
{ "spyfox", "JR-Demo", kGenMac }, // FR Mac demo
{ "spyfox2", "sf2-demo", kGenPC },
{ "spyfox2", "sf2demo", kGenPC },
+ { "spyfox2", "Sf2demo", kGenMac },
{ "spyfox2", "Spy Fox 2 - Demo", kGenMac },
{ "spyfox2", "Spy Fox 2", kGenMac },
{ "spyfox2", "spyfoxsr", kGenPC },
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 42a9bd2fed..3b4d4b3330 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -206,10 +206,11 @@ enum ScummGameId {
GID_ZAK,
GID_MONKEY_SEGA,
GID_HEGAME, // Generic name for all HE games with default behaviour
+ GID_PUTTDEMO,
GID_FBEAR,
GID_FUNPACK,
GID_FREDDI2,
- GID_PUTTDEMO,
+ GID_WATER,
GID_PUTTRACE,
GID_FUNSHOP, // Used for all three funshops
GID_FOOTBALL
diff --git a/tools/scumm-md5.txt b/tools/scumm-md5.txt
index c91d4c9576..3772a354fc 100644
--- a/tools/scumm-md5.txt
+++ b/tools/scumm-md5.txt
@@ -359,7 +359,7 @@ Freddie Fish 4: The Case of the Hogfish Rustlers of Briny Gulch
- Windows nl 14d48c95b43ddeb983254cf6c43851f1 freddi4 adutchguy
- Windows ru 78bd5f036ea35a878b74e4f47941f784 freddi4 sev
- Windows ru 07b810e37be7489263f7bc7627d4765d freddi4 sev
- Demo Windows de 688328c5bdc4c8ec4145688dfa077bf2 freddi4 Joachim Eberhard
+ Demo All de 688328c5bdc4c8ec4145688dfa077bf2 freddi4 Joachim Eberhard
Demo All en 7c2e76087027eeee9c8f8985f93a1cc5 freddi4 khalek
Demo Windows en c25755b08a8d0d47695e05f1e2111bfc freddi4 sev
Demo All en ebd324dcf06a4c49e1ba5c231eee1060 freddi4 sev
@@ -432,7 +432,7 @@ Pajama Sam 2: Thunder and Lightning Aren't so Frightening
Pajama Sam 3: You Are What You Eat From Your Head to Your Feet
- Windows en f7711f9264d4d43c2a1518ec7c10a607 pajama3 Kirben
- All de 2e8a1f76ea33bc5e04347646feee173d pajama3 Joachim Eberhard
- Demo Windows de 0c45eb4baff0c12c3d9dfa889c8070ab pajama3 Joachim Eberhard
+ Demo All de 0c45eb4baff0c12c3d9dfa889c8070ab pajama3 Joachim Eberhard
Demo Windows en a654fb60c3b67d6317a7894ffd9f25c5 pajama3 sev
Demo All en a9f2f04b1ecaab9495b59befffe9bf88 pajama3 sev
Demo Windows en cf90b4db5486ef798db78fe6fbf897e5 pajama3 khalek
@@ -453,7 +453,7 @@ Pajama Sam's Sock Works
Putt-Putt Enters the Race
- All en 981e1e1891f2be7e25a01f50ae55a5af puttrace Kirben
- Demo Windows de 663743c03ae0c007f3d665cf631c0e6b puttrace Joachim Eberhard
+ Demo All de 663743c03ae0c007f3d665cf631c0e6b puttrace Joachim Eberhard
Demo All en 0ac41e2e3d2174e5a042a6b565328dba puttrace sev
Demo Windows en 7c8100e360e8ef05f88069d4cfa0afd1 puttrace eriktorbjorn
Demo All nl 6af2419fe3db5c2fdb091ae4e5833770 puttrace Kirben
@@ -548,7 +548,7 @@ Spy Fox 2: Some Assembly Required
- Windows nl 71fe97c3108678cf604f14abe342341b spyfox2 adutchguy
- All ru cea91e3dd47f2518ea418e41611aa77f spyfox2 sev
Demo All en 7222f260253f325c21fcfa68b5bfab67 spyfox2 Kirben
- Demo Windows de 732845548b1d6c2da572cb6a1bf81b07 spyfox2 Joachim Eberhard
+ Demo All de 732845548b1d6c2da572cb6a1bf81b07 spyfox2 Joachim Eberhard
Demo Windows en 19bf6938a94698296bcb0c99c31c91a7 spyfox2 eriktorbjorn
Demo All nl 1c792d28376d45e145cb916bca0400a2 spyfox2 joostp
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 02:34:53 +0000