diff options
| -rw-r--r-- | scumm/script_v72he.cpp | 10 | ||||
| -rw-r--r-- | scumm/scumm-md5.h | 5 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 755c777398..de487d2ae8 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -2149,10 +2149,13 @@ void ScummEngine_v72he::o72_readINI() { switch (type) { case 43: // HE 100 case 6: // number - if (!strcmp((char *)option, "NoPrinting")) + if (!strcmp((char *)option, "NoPrinting")) { push(1); - else + } else if (!strcmp((char *)option, "TextOn")) { + push(ConfMan.getBool("subtitles")); + } else { push(ConfMan.getInt((char *)option)); + } break; case 77: // HE 100 case 7: // string @@ -2194,6 +2197,9 @@ void ScummEngine_v72he::o72_writeINI() { if (!strcmp((char *)option, "HETest")) return; + // Filter out confusing subtitle setting + if (!strcmp((char *)option, "TextOn")) + // Filter out confusing path settings if (!strcmp((char *)option, "DownLoadPath") || !strcmp((char *)option, "GameResourcePath") || !strcmp((char *)option, "SaveGamePath")) return; diff --git a/scumm/scumm-md5.h b/scumm/scumm-md5.h index 2ddbc27948..853092b5e1 100644 --- a/scumm/scumm-md5.h +++ b/scumm/scumm-md5.h @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Sun May 08 00:54:15 2005 + This file was generated by the md5table tool on Sun May 08 12:06:27 2005 DO NOT EDIT MANUALLY! */ @@ -26,6 +26,7 @@ static const MD5Table md5table[] = { { "0ab19be9e2a3f6938226638b2a3744fe", "timedemo", Common::EN_USA, Common::kPlatformUnknown }, { "0ac41e2e3d2174e5a042a6b565328dba", "racedemo", Common::EN_USA, Common::kPlatformUnknown }, { "0b3222aaa7efcf283eb621e0cefd26cc", "puttputt", Common::RU_RUS, Common::kPlatformPC }, + { "0cccfa5223099a60e76cfcca57a1a141", "adutchguy", Common::NL_NLD, Common::kPlatformWindows }, { "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", Common::ES_ESP, Common::kPlatformPC }, { "0e4c5d54a0ad4b26132e78b5ea76642a", "snmidemo", Common::EN_USA, Common::kPlatformPC }, { "0f5935bd5e88ba6f09e558d64459746d", "1grademo", Common::EN_USA, Common::kPlatformWindows }, @@ -38,6 +39,7 @@ static const MD5Table md5table[] = { { "11e6e244078ff09b0f3832e35420e0a7", "catalog", Common::EN_USA, Common::kPlatformWindows }, { "132bff65e6367c09cc69318ce1b59333", "monkey2", Common::EN_USA, Common::kPlatformAmiga }, { "145bd3373574feb668cc2eea2ec6cf86", "balloon", Common::RU_RUS, Common::kPlatformWindows }, + { "14d48c95b43ddeb983254cf6c43851f1", "freddi4", Common::NL_NLD, Common::kPlatformWindows }, { "157367c3c21e0d03a0cba44361b4cf65", "indy3EGA", Common::EN_USA, Common::kPlatformAtariST }, { "15e03ffbfeddb9c2aebc13dcb2a4a8f4", "monkeyvga", Common::EN_USA, Common::kPlatformPC }, { "16effd200aa6b8abe9c569c3e578814d", "f4-demo", Common::NL_NLD, Common::kPlatformWindows }, @@ -178,7 +180,6 @@ static const MD5Table md5table[] = { { "701246819d1a70573f41bf33fc19214f", "soccer", Common::EN_USA, Common::kPlatformWindows }, { "7020931d5a2be0a49d68e7a1882363e4", "zak", Common::EN_USA, Common::kPlatformPC }, { "71523b539491527d9860f4407faf0411", "monkeyega", Common::EN_USA, Common::kPlatformPC }, - { "71fe97c3108678cf604f14abe342341b", "spyfox2", Common::NL_NLD, Common::kPlatformWindows }, { "7222f260253f325c21fcfa68b5bfab67", "sf2-demo", Common::EN_USA, Common::kPlatformUnknown }, { "72ac6bc980d5101c2142189d746bd62f", "spyfox", Common::RU_RUS, Common::kPlatformWindows }, { "73e5ab7dbb9a8061cc6d25df02dbd1e7", "loom", Common::EN_USA, Common::kPlatformPC }, diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a9aba6ed56..0a227a8cef 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -574,6 +574,7 @@ static SubstResFileNames substResFileNameTable[] = { { "footdemo", "FootBall2002", kGenPC }, { "freddemo", "Freddi Demo", kGenMac }, { "freddi", "Freddi Fish", kGenMac }, + { "FreddiD", "Freddi Fish", kGenPC }, { "freddi2", "Freddi Fish 2", kGenMac }, { "freddi2", "FreddiCHSH", kGenPC }, { "freddi3", "Freddi Fish 3", kGenMac }, @@ -582,6 +583,7 @@ static SubstResFileNames substResFileNameTable[] = { { "freddi4", "FreddiHRBG", kGenPC }, { "freddicove", "FreddiCove", kGenMac }, { "freddicove", "FreddiCCC", kGenPC }, + { "freddicove", "FreddiDZZ", kGenPC }, { "kinddemo", "Kinddemo", kGenMac }, { "kinddemo", "KindDemo", kGenMac }, { "lost", "Lost and Found", kGenMac}, |