diff options
| -rw-r--r-- | engines/scumm/he/script_v60he.cpp | 9 | ||||
| -rw-r--r-- | engines/scumm/plugin.cpp | 31 | ||||
| -rw-r--r-- | engines/scumm/scumm-md5.h | 4 | ||||
| -rw-r--r-- | tools/scumm-md5.txt | 4 |
4 files changed, 25 insertions, 23 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 9dcf12d295..a70a50b0a5 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -412,6 +412,7 @@ int ScummEngine_v60he::convertFilePath(byte *dst) { else dst[j++] = dst[i]; } + dst[j] = 0; } else { // Switch all \ to / for portablity for (int i = 0; i < len; i++) { @@ -984,12 +985,8 @@ void ScummEngine_v60he::o60_openFile() { len = resStrLen(_scriptPointer); _scriptPointer += len + 1; - for (r = strlen((char*)buffer); r != 0; r--) { - if (buffer[r - 1] == '\\') - break; - } - - filename = (char *)buffer + r; + filename = (char *)buffer + convertFilePath(buffer); + debug(1, "Final filename to %s", filename); mode = pop(); slot = -1; diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp index 8d029366f6..4850102fd5 100644 --- a/engines/scumm/plugin.cpp +++ b/engines/scumm/plugin.cpp @@ -257,20 +257,20 @@ static const GameSettings gameVariantsTable[] = { #endif // Humongous Entertainment Scumm Version 6 - {"puttmoon", "", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, + {"activity", "", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, {"funpack", 0, GID_FUNPACK, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, {"fbpack", 0, GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, + {"fbear", "HE 61", GID_FBEAR, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, + {"fbear", "HE 70", GID_FBEAR, 6, 70, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, + + {"puttmoon", "", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, + {"puttputt", "HE 61", GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, {"puttputt", "HE 60", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC}, {"puttputt", "Demo", GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, - {"fbear", "HE 61", GID_FBEAR, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, - {"fbear", "HE 70", GID_FBEAR, 6, 70, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, - #ifndef DISABLE_HE - {"activity", 0, GID_HEGAME, 6, 70, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, UNK}, - // Humongous Entertainment Scumm Version 7.1 // The first version to use 640x480 resolution // There are also 7.1 versions of freddemo, airdemo and farmdemo @@ -461,27 +461,28 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "comi", "comi.la%d", kGenDiskNum, UNK_LANG, UNK, 0 }, #endif + { "activity", "activity", kGenHEPC, UNK_LANG, UNK, 0 }, + { "activity", "Putt & Fatty's Actpack", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, + + { "fbpack", "fbpack", kGenHEPC, UNK_LANG, UNK, 0 }, + { "funpack", "funpack", kGenHEPC, UNK_LANG, UNK, 0 }, + { "fbear", "fbear", kGenHEPC, UNK_LANG, UNK, 0 }, { "fbear", "fbdemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "fbear", "Fatty Bear Demo", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "fbear", "Fatty Bear", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, - { "fbpack", "fbpack", kGenHEPC, UNK_LANG, UNK, 0 }, - { "funpack", "funpack", kGenHEPC, UNK_LANG, UNK, 0 }, + { "puttputt", "puttputt", kGenHEPC, UNK_LANG, UNK, 0 }, + { "puttputt", "puttdemo", kGenHEPC, UNK_LANG, UNK, 0 }, + { "puttputt", "Putt-Putt's Demo", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, + { "puttputt", "Putt-Putt Parade", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "puttmoon", "puttmoon", kGenHEPC, UNK_LANG, UNK, 0 }, { "puttmoon", "moondemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "puttmoon", "Putt-Putt Moon Demo", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "puttmoon", "Putt-Putt Moon", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, - { "puttputt", "puttputt", kGenHEPC, UNK_LANG, UNK, 0 }, - { "puttputt", "puttdemo", kGenHEPC, UNK_LANG, UNK, 0 }, - { "puttputt", "Putt-Putt's Demo", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, - { "puttputt", "Putt-Putt Parade", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, - #ifndef DISABLE_HE - { "activity", "activity", kGenHEPC, UNK_LANG, UNK, 0 }, - { "airport", "airport", kGenHEPC, UNK_LANG, UNK, 0 }, { "airport", "airdemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "airport", "Airport Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h index 1729f9c656..969db4855d 100644 --- a/engines/scumm/scumm-md5.h +++ b/engines/scumm/scumm-md5.h @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Tue Jun 6 15:33:05 2006 + This file was generated by the md5table tool on Fri Jun 09 07:39:46 2006 DO NOT EDIT MANUALLY! */ @@ -40,6 +40,7 @@ static const MD5Table md5table[] = { { "0cccfa5223099a60e76cfcca57a1a141", "freddi3", "", "", Common::NL_NLD, Common::kPlatformWindows }, { "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", "V2", "V2", Common::ES_ESP, Common::kPlatformPC }, { "0e4c5d54a0ad4b26132e78b5ea76642a", "samnmax", "", "Demo", Common::EN_ANY, Common::kPlatformPC }, + { "0e96ab45a4eb72acc1b46813976589fd", "activity", "", "", Common::EN_ANY, Common::kPlatformMacintosh }, { "0e9b01430e31d9fcd94071d433bbc6bf", "loom", "No Adlib", "EGA", Common::FR_FRA, Common::kPlatformAtariST }, { "0f5935bd5e88ba6f09e558d64459746d", "thinker1", "", "Demo", Common::EN_ANY, Common::kPlatformWindows }, { "0f6f2e716ba896a44e5059bba1de7ca9", "samnmax", "", "CD", Common::IT_ITA, Common::kPlatformUnknown }, @@ -98,6 +99,7 @@ static const MD5Table md5table[] = { { "2a208ffbcd0e83e86f4356e6f64aa6e1", "loom", "EGA", "EGA", Common::ES_ESP, Common::kPlatformPC }, { "2a41b53cf1a90b6e6f26c10cc6041084", "tentacle", "", "Demo", Common::EN_ANY, Common::kPlatformMacintosh }, { "2a446817ffcabfef8716e0c456ecaf81", "puttzoo", "", "Demo", Common::DE_DEU, Common::kPlatformWindows }, + { "2c04aacffb8428f30ccf4f734fbe3adc", "activity", "", "", Common::EN_ANY, Common::kPlatformPC }, { "2ccd8891ce4d3f1a334d21bff6a88ca2", "monkey", "CD", "", Common::EN_ANY, Common::kPlatformMacintosh }, { "2d1e891fe52df707c30185e52c50cd92", "monkey", "CD", "CD", Common::EN_ANY, Common::kPlatformPC }, { "2d388339d6050d8ccaa757b64633954e", "zak", "FM-TOWNS", "", Common::EN_ANY, Common::kPlatformFMTowns }, diff --git a/tools/scumm-md5.txt b/tools/scumm-md5.txt index edd9fea81b..7c78defb0c 100644 --- a/tools/scumm-md5.txt +++ b/tools/scumm-md5.txt @@ -609,7 +609,9 @@ dog Putt-Putt and Pep's Dog on a Stick d4b8ee426b1afd3e53bc0cf020418cf6 en Windows HE 99 - - sev activity Putt-Putt & Fatty Bear's Activity Pack - b628506f7def772e40de0aa5440fb8e1 en Windows HE 70 - - + 2c04aacffb8428f30ccf4f734fbe3adc en DOS - - - Kirben + 0e96ab45a4eb72acc1b46813976589fd en Mac - - - Kirben + b628506f7def772e40de0aa5440fb8e1 en Windows HE 70 - - Kirben funpack Putt-Putt's Fun Pack 8afb3cf9f95abf208358e984f0c9e738 en 3DO - - - sev |