[Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.84,2.85 scumm.cpp,1.560,1.561 sound.cpp,1.474,1.475
Eugene Sandulenko
sev at users.sourceforge.net
Sun Sep 4 05:43:22 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24286/scumm
Modified Files:
scumm-md5.h scumm.cpp sound.cpp
Log Message:
Implement my own request #1091806 "SCUMM: Eliminate platform-specific targets".
.ini file gets auto-upgraded and user gets a warning to console. Old targets
are still present but get converted immediately. We could remove them maybe
after 2 releases.
Also demos targets were removed as well. Probably next target is HE demos.
I tried my best to test all combinations of files, but bugs still may be
present.
Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.84
retrieving revision 2.85
diff -u -d -r2.84 -r2.85
--- scumm-md5.h 30 Aug 2005 12:29:36 -0000 2.84
+++ scumm-md5.h 4 Sep 2005 12:42:18 -0000 2.85
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Tue Aug 30 12:28:21 2005
+ This file was generated by the md5table tool on Sun Sep 4 12:35:29 2005
DO NOT EDIT MANUALLY!
*/
@@ -12,11 +12,11 @@
static const MD5Table md5table[] = {
{ "0305e850382b812fec6e5998ef88a966", "pjs-demo", Common::NL_NLD, Common::kPlatformWindows },
- { "035deab53b47bc43abc763560d0f8d4b", "playfate", Common::EN_USA, Common::kPlatformPC },
+ { "035deab53b47bc43abc763560d0f8d4b", "atlantis", Common::EN_USA, Common::kPlatformPC },
{ "037385a953789190298494d92b89b3d0", "catalog2", Common::EN_USA, Common::kPlatformWindows },
- { "0425954a9db5c340861672892c3e678d", "samdemo", Common::EN_USA, Common::kPlatformMacintosh },
+ { "0425954a9db5c340861672892c3e678d", "samnmax", Common::EN_USA, Common::kPlatformMacintosh },
{ "04401d747f1a2c1c4b388daff71ed378", "ft", Common::DE_DEU, Common::kPlatformMacintosh },
- { "04687cdf7f975a89d2474929f7b80946", "indy3towns", Common::EN_USA, Common::kPlatformFMTowns },
+ { "04687cdf7f975a89d2474929f7b80946", "indy3", Common::EN_USA, Common::kPlatformFMTowns },
{ "0557df19f046a84c2fdc63507c6616cb", "farmdemo", Common::NL_NLD, Common::kPlatformWindows },
{ "06b187468113f9ae5a400b148a847fac", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
{ "07433205acdca3bc553d0e731588b35f", "airport", Common::EN_USA, Common::kPlatformWindows },
@@ -25,16 +25,16 @@
{ "0855496dde35356b1a9691e22ba84cdc", "freddemo", Common::EN_USA, Common::kPlatformWindows },
{ "08cc5c3eedaf72ebe12734eee94f7fa2", "balloon", Common::EN_USA, Common::kPlatformUnknown },
{ "09820417db26687bb7fe0c83cc4c553b", "ft", Common::EN_USA, Common::kPlatformUnknown },
- { "0a212fa35fa8421f31c1f3961272caf0", "monkeyvga", Common::DE_DEU, Common::kPlatformAmiga },
+ { "0a212fa35fa8421f31c1f3961272caf0", "monkey", Common::DE_DEU, Common::kPlatformAmiga },
{ "0ab19be9e2a3f6938226638b2a3744fe", "timedemo", Common::EN_USA, Common::kPlatformUnknown },
{ "0ac41e2e3d2174e5a042a6b565328dba", "racedemo", Common::EN_USA, Common::kPlatformUnknown },
{ "0b3222aaa7efcf283eb621e0cefd26cc", "puttputt", Common::RU_RUS, Common::kPlatformPC },
{ "0cccfa5223099a60e76cfcca57a1a141", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
{ "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", Common::ES_ESP, Common::kPlatformPC },
- { "0e4c5d54a0ad4b26132e78b5ea76642a", "snmidemo", Common::EN_USA, Common::kPlatformPC },
+ { "0e4c5d54a0ad4b26132e78b5ea76642a", "samnmax", Common::EN_USA, Common::kPlatformPC },
{ "0f5935bd5e88ba6f09e558d64459746d", "1grademo", Common::EN_USA, Common::kPlatformWindows },
{ "0f6f2e716ba896a44e5059bba1de7ca9", "samnmax", Common::IT_ITA, Common::kPlatformUnknown },
- { "0f9c7a76657f0840b8f7ccb5bffeb9f4", "indy3EGA", Common::FR_FRA, Common::kPlatformAtariST },
+ { "0f9c7a76657f0840b8f7ccb5bffeb9f4", "indy3", Common::FR_FRA, Common::kPlatformAtariST },
{ "0fb73eddfcf584c02ba097984df131ba", "samnmax", Common::DE_DEU, Common::kPlatformUnknown },
{ "1005456bfe351c1b679e1ff2dc2849e9", "puttzoo", Common::EN_USA, Common::kPlatformWindows },
{ "114acdc2659a273c220f86ee9edb24c1", "maniac", Common::FR_FRA, Common::kPlatformPC },
@@ -43,13 +43,13 @@
{ "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 },
+ { "157367c3c21e0d03a0cba44361b4cf65", "indy3", Common::EN_USA, Common::kPlatformAtariST },
+ { "15e03ffbfeddb9c2aebc13dcb2a4a8f4", "monkey", Common::EN_USA, Common::kPlatformPC },
{ "16542a7342a918bfe4ba512007d36c47", "FreddisFunShop", Common::EN_USA, Common::kPlatformUnknown },
{ "16effd200aa6b8abe9c569c3e578814d", "f4-demo", Common::NL_NLD, Common::kPlatformWindows },
{ "179879b6e35c1ead0d93aab26db0951b", "fbear", Common::EN_USA, Common::kPlatformWindows },
{ "17b5d5e6af4ae89d62631641d66d5a05", "indy3", Common::IT_ITA, Common::kPlatformPC },
- { "17fa250eb72dae2dad511ba79c0b6b0a", "dottdemo", Common::FR_FRA, Common::kPlatformPC },
+ { "17fa250eb72dae2dad511ba79c0b6b0a", "tentacle", Common::FR_FRA, Common::kPlatformPC },
{ "182344899c2e2998fca0bebcd82aa81a", "atlantis", Common::EN_USA, Common::kPlatformPC },
{ "183d7464902d40d00800e8ee1f04117c", "maniac", Common::DE_DEU, Common::kPlatformPC },
{ "1875b90fade138c9253a8e967007031a", "indy3", Common::UNK_LANG, Common::kPlatformPC },
@@ -58,10 +58,10 @@
{ "19263586f749a560c1adf8b3393a9593", "socks", Common::RU_RUS, Common::kPlatformWindows },
{ "1a6e5ae2777a6a33f06ffc0226210934", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
{ "1c792d28376d45e145cb916bca0400a2", "sf2-demo", Common::NL_NLD, Common::kPlatformUnknown },
- { "1ca86e2cf9aaa2068738a1e5ba477e60", "zakTowns", Common::JA_JPN, Common::kPlatformFMTowns },
- { "1d05cd189e4908f79b57e78a4402f292", "monkeyega", Common::EN_USA, Common::kPlatformPC },
- { "1dd3c11ea4439adfe681e4e405b624e1", "monkeyega", Common::FR_FRA, Common::kPlatformPC },
- { "1dd7aa088e09f96d06818aa9a9deabe0", "indy3EGA", Common::EN_USA, Common::kPlatformMacintosh },
+ { "1ca86e2cf9aaa2068738a1e5ba477e60", "zak", Common::JA_JPN, Common::kPlatformFMTowns },
+ { "1d05cd189e4908f79b57e78a4402f292", "monkey", Common::EN_USA, Common::kPlatformPC },
+ { "1dd3c11ea4439adfe681e4e405b624e1", "monkey", Common::FR_FRA, Common::kPlatformPC },
+ { "1dd7aa088e09f96d06818aa9a9deabe0", "indy3", Common::EN_USA, Common::kPlatformMacintosh },
{ "1fbebd7b2b692df5297870447a80cfed", "atlantis", Common::DE_DEU, Common::kPlatformPC },
{ "2012f854d83d9cc6f73b2b544cd8bbf8", "water", Common::RU_RUS, Common::kPlatformWindows },
{ "2108d83dcf09f8adb4bc524669c8cf51", "PuttTime", Common::EN_USA, Common::kPlatformUnknown },
@@ -73,41 +73,41 @@
{ "22f4ea88a09da12df9308ba30bcb7d0f", "loom", Common::EN_USA, Common::kPlatformPC },
{ "2723fea3dae0cb47768c424b145ae0e7", "tentacle", Common::EN_USA, Common::kPlatformPC },
{ "27b3a4224ad63d5b04627595c1c1a025", "zak", Common::IT_ITA, Common::kPlatformAmiga },
- { "28d24a33448fab6795850bc9f159a4a2", "indydemo", Common::JA_JPN, Common::kPlatformFMTowns },
+ { "28d24a33448fab6795850bc9f159a4a2", "atlantis", Common::JA_JPN, Common::kPlatformFMTowns },
{ "28ef68ee3ed76d7e2ee8ee13c15fbd5b", "loom", Common::EN_USA, Common::kPlatformPC },
{ "2a208ffbcd0e83e86f4356e6f64aa6e1", "loom", Common::ES_ESP, Common::kPlatformPC },
{ "2ccd8891ce4d3f1a334d21bff6a88ca2", "monkey", Common::EN_USA, Common::kPlatformMacintosh },
{ "2d1e891fe52df707c30185e52c50cd92", "monkey", Common::EN_USA, Common::kPlatformPC },
- { "2d388339d6050d8ccaa757b64633954e", "zakTowns", Common::EN_USA, Common::kPlatformFMTowns },
- { "2d4536a56e01da4b02eb021e7770afa2", "zakTowns", Common::EN_USA, Common::kPlatformFMTowns },
+ { "2d388339d6050d8ccaa757b64633954e", "zak", Common::EN_USA, Common::kPlatformFMTowns },
+ { "2d4536a56e01da4b02eb021e7770afa2", "zak", Common::EN_USA, Common::kPlatformFMTowns },
{ "2e85f7aa054930c692a5b1bed1dfc295", "footdemo", Common::EN_USA, Common::kPlatformUnknown },
{ "2fe369ad70f52a8cf7ad6077ee64f81a", "loom", Common::DE_DEU, Common::kPlatformAmiga },
{ "305d3dd57c96c65b017bc70c8c7cfb5e", "monkey", Common::DE_DEU, Common::kPlatformPC },
{ "30ba1e825d4ad2b448143ae8df18482a", "pj2demo", Common::NL_NLD, Common::kPlatformWindows },
- { "319a4dde52c7960b5aae8a1ec348d918", "monkeyvga", Common::DE_DEU, Common::kPlatformAmiga },
+ { "319a4dde52c7960b5aae8a1ec348d918", "monkey", Common::DE_DEU, Common::kPlatformAmiga },
{ "31aa57f460a3d12429f0552a46a90b39", "puttdemo", Common::EN_USA, Common::kPlatformPC },
- { "31b8fda4c8c7413fa6b39997e776eba4", "loomTowns", Common::JA_JPN, Common::kPlatformFMTowns },
+ { "31b8fda4c8c7413fa6b39997e776eba4", "loom", Common::JA_JPN, Common::kPlatformFMTowns },
{ "32709cbeeb3044b34129950860a83f14", "pajama2", Common::RU_RUS, Common::kPlatformWindows },
- { "32a433dea56b86a55b59e4ff7d755711", "ftpcdemo", Common::EN_USA, Common::kPlatformPC },
- { "330f631502e381a4e199a3f7cb483c20", "indy3EGA", Common::DE_DEU, Common::kPlatformAmiga },
- { "3433be9866ca4261b2d5d25374e3f243", "monkeyvga", Common::FR_FRA, Common::kPlatformAmiga },
+ { "32a433dea56b86a55b59e4ff7d755711", "ft", Common::EN_USA, Common::kPlatformPC },
+ { "330f631502e381a4e199a3f7cb483c20", "indy3", Common::DE_DEU, Common::kPlatformAmiga },
+ { "3433be9866ca4261b2d5d25374e3f243", "monkey", Common::FR_FRA, Common::kPlatformAmiga },
{ "3486ede0f904789267d4bcc5537a46d4", "zoodemo", Common::EN_USA, Common::kPlatformMacintosh },
{ "35a2d3040fa512f8232d9e443319d84d", "dig", Common::EN_USA, Common::kPlatformMacintosh },
- { "362c1d281fb9899254cda66ad246c66a", "digdemo", Common::EN_USA, Common::kPlatformUnknown },
+ { "362c1d281fb9899254cda66ad246c66a", "dig", Common::EN_USA, Common::kPlatformUnknown },
{ "3686cf8f89e102ececf4366e1d2c8126", "monkey2", Common::EN_USA, Common::kPlatformPC },
{ "36a6750e03fb505fc19fc2bf3e4dbe91", "pj2demo", Common::EN_USA, Common::kPlatformUnknown },
{ "37aed3f91c1ef959e0bd265f9b13781f", "pajama", Common::EN_USA, Common::kPlatformUnknown },
{ "37f56ceb13e401a7ac7d9e6b37fecaf7", "loom", Common::EN_USA, Common::kPlatformPC },
{ "37ff1b308999c4cca7319edfcc1280a0", "puttdemo", Common::EN_USA, Common::kPlatformWindows },
{ "3824e60cdf639d22f6df92a03dc4b131", "fbear", Common::EN_USA, Common::kPlatformPC },
- { "387a544b8b10b26912d8413bab63a853", "mi2demo", Common::EN_USA, Common::kPlatformPC },
+ { "387a544b8b10b26912d8413bab63a853", "monkey2", Common::EN_USA, Common::kPlatformPC },
{ "3905799e081b80a61d4460b7b733c206", "maniac", Common::EN_USA, Common::kPlatformNES },
- { "3938ee1aa4433fca9d9308c9891172b1", "zakTowns", Common::EN_USA, Common::kPlatformFMTowns },
+ { "3938ee1aa4433fca9d9308c9891172b1", "zak", Common::EN_USA, Common::kPlatformFMTowns },
{ "399b217b0c8d65d0398076da486363a9", "indy3", Common::DE_DEU, Common::kPlatformPC },
{ "39cb9dec16fa16f38d79acd80effb059", "loom", Common::FR_FRA, Common::kPlatformAmiga },
{ "39cb9dec16fa16f38d79acd80effb059", "loom", Common::IT_ITA, Common::kPlatformAmiga },
{ "3a03dab514e4038df192d8a8de469788", "atlantis", Common::EN_USA, Common::kPlatformAmiga },
- { "3a0c35f3c147b98a2bdf8d400cfc4ab5", "indy3towns", Common::JA_JPN, Common::kPlatformFMTowns },
+ { "3a0c35f3c147b98a2bdf8d400cfc4ab5", "indy3", Common::JA_JPN, Common::kPlatformFMTowns },
{ "3b301b7892f883ce42ab4be6a274fea6", "samnmax", Common::EN_USA, Common::kPlatformPC },
{ "3de99ef0523f8ca7958faa3afccd035a", "spyfox", Common::EN_USA, Common::kPlatformUnknown },
{ "3df6ead57930488bc61e6e41901d0e97", "fbear", Common::EN_USA, Common::kPlatformMacintosh },
@@ -115,11 +115,11 @@
{ "4167a92a1d46baa4f4127d918d561f88", "tentacle", Common::EN_USA, Common::kPlatformUnknown },
{ "430bc518017b6fac046f58bab6baad5d", "monkey2", Common::JA_JPN, Common::kPlatformFMTowns },
{ "45082a5c9f42ba14dacfe1fdeeba819d", "ff5demo", Common::EN_USA, Common::kPlatformWindows },
- { "45152f7cf2ba8f43cf8a8ea2e740ae09", "monkeyvga", Common::ES_ESP, Common::kPlatformPC },
+ { "45152f7cf2ba8f43cf8a8ea2e740ae09", "monkey", Common::ES_ESP, Common::kPlatformPC },
{ "46b53fd430adcfbed791b48a0d4b079f", "funpack", Common::EN_USA, Common::kPlatformPC },
- { "477dbafbd66a53c98416dc01aef019ad", "monkeyega", Common::IT_ITA, Common::kPlatformPC },
+ { "477dbafbd66a53c98416dc01aef019ad", "monkey", Common::IT_ITA, Common::kPlatformPC },
{ "47e75b1bdcb44c78cb94883d1731ccf8", "fbdemo", Common::EN_USA, Common::kPlatformPC },
- { "49210e124e4c2b30f1290a9ef6306301", "monkeyega", Common::EN_USA, Common::kPlatformPC },
+ { "49210e124e4c2b30f1290a9ef6306301", "monkey", Common::EN_USA, Common::kPlatformPC },
{ "499c958affc394f2a3868f1eb568c3ee", "f4-demo", Common::NL_NLD, Common::kPlatformWindows },
{ "4af4a6b248103c1fe9edef619677f540", "moondemo", Common::EN_USA, Common::kPlatformMacintosh },
{ "4ba37f835be11a59d969f90f272f575b", "water", Common::EN_USA, Common::kPlatformUnknown },
@@ -127,7 +127,7 @@
{ "4bedb49943df95a9c900a5a82ccbe9de", "ft", Common::FR_FRA, Common::kPlatformUnknown },
{ "4cb9c3618f71668f8e4346c8f323fa82", "monkey2", Common::EN_USA, Common::kPlatformMacintosh },
{ "4ce2d5b355964bbcb5e5ce73236ef868", "freddicove", Common::RU_RUS, Common::kPlatformWindows },
- { "4d34042713958b971cb139fba4658586", "indy4", Common::JA_JPN, Common::kPlatformFMTowns },
+ { "4d34042713958b971cb139fba4658586", "atlantis", Common::JA_JPN, Common::kPlatformFMTowns },
{ "4dbff3787aedcd96b0b325f2d92d7ad9", "maze", Common::EN_USA, Common::kPlatformUnknown },
{ "4dc780f1bc587a193ce8a97652791438", "loom", Common::EN_USA, Common::kPlatformAmiga },
{ "4e5867848ee61bc30d157e2c94eee9b4", "timedemo", Common::EN_USA, Common::kPlatformUnknown },
@@ -144,7 +144,7 @@
{ "5262a27afcaee04e5c4900220bd463e7", "PuttsFunShop", Common::EN_USA, Common::kPlatformUnknown },
{ "52a4bae0746a11d7b1e8554e91a6645c", "zak", Common::FR_FRA, Common::kPlatformPC },
{ "53e94115b55dd51d4b8ff0871aa1df1e", "spydemo", Common::EN_USA, Common::kPlatformUnknown },
- { "54a936ad06161ff7bfefcb96200f7bff", "monkeyvga", Common::EN_USA, Common::kPlatformAmiga },
+ { "54a936ad06161ff7bfefcb96200f7bff", "monkey", Common::EN_USA, Common::kPlatformAmiga },
{ "55518cd73cf9c6d23ea29c51ee06bdfe", "ft", Common::IT_ITA, Common::kPlatformUnknown },
{ "55e4cc866ff9046824e1c638ba2b8c7f", "ft", Common::RU_RUS, Common::kPlatformUnknown },
{ "566165a7338fa11029e7c14d94fa70d0", "freddemo", Common::EN_USA, Common::kPlatformWindows },
@@ -157,17 +157,17 @@
{ "5b08000a9c47b2887df6506ac767ca68", "fbear", Common::EN_USA, Common::kPlatformUnknown },
{ "5bd335265a61caa3d78956ad9f88ba23", "footdemo", Common::EN_USA, Common::kPlatformUnknown },
{ "5c21fc49aee8f46e58fef21579e614a1", "thinker1", Common::EN_USA, Common::kPlatformUnknown },
- { "5d88b9d6a88e6f8e90cded9d01b7f082", "loomcd", Common::EN_USA, Common::kPlatformPC },
+ { "5d88b9d6a88e6f8e90cded9d01b7f082", "loom", Common::EN_USA, Common::kPlatformPC },
{ "5e8fb66971a60e523e5afbc4c129c0e8", "socks", Common::EN_USA, Common::kPlatformUnknown },
- { "5fbe557049892eb4b709d90916ec97ca", "indy3EGA", Common::EN_USA, Common::kPlatformPC },
+ { "5fbe557049892eb4b709d90916ec97ca", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "600abd3e9f47e63e670188b7e4e86ac7", "spyozon", Common::EN_USA, Common::kPlatformUnknown },
{ "6027e9ca9c35746d95dee2068cec17e5", "zak", Common::DE_DEU, Common::kPlatformAmiga },
{ "60ba818dc3bede86d40357e3913f8505", "ft", Common::EN_USA, Common::kPlatformUnknown },
{ "613f64f78ea26c7353b2a5940eb61d6a", "zak", Common::FR_FRA, Common::kPlatformAtariST },
{ "624cdb93654667c869d204a64af7e57f", "maniac", Common::EN_USA, Common::kPlatformPC },
{ "6271130f440066830eca9056c1d7926f", "water", Common::RU_RUS, Common::kPlatformWindows },
- { "66236cd1aec24e1d4aff4c4cc93b7e18", "indy3EGA", Common::FR_FRA, Common::kPlatformPC },
- { "66fd5ff9a810dfeb6d6bdada18221140", "monkeyvga", Common::IT_ITA, Common::kPlatformPC },
+ { "66236cd1aec24e1d4aff4c4cc93b7e18", "indy3", Common::FR_FRA, Common::kPlatformPC },
+ { "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 },
@@ -180,17 +180,17 @@
{ "6af2419fe3db5c2fdb091ae4e5833770", "racedemo", Common::NL_NLD, Common::kPlatformUnknown },
{ "6b19d0e25cbf720d05822379b8b90ed9", "timedemo", Common::NL_NLD, Common::kPlatformWindows },
{ "6b257bb2827dd894b8109a50a1a18b5a", "FF5Demo", Common::NL_NLD, Common::kPlatformWindows },
- { "6b3ec67da214f558dc5ceaa2acd47453", "indy3EGA", Common::EN_USA, Common::kPlatformPC },
+ { "6b3ec67da214f558dc5ceaa2acd47453", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "6bf70eee5de3d24d2403e0dd3d267e8a", "spyfox", Common::EN_USA, Common::kPlatformWindows },
- { "6c2bff0e327f2962e809c2e1a82d7309", "monkeyvga", Common::EN_USA, Common::kPlatformAmiga },
+ { "6c2bff0e327f2962e809c2e1a82d7309", "monkey", Common::EN_USA, Common::kPlatformAmiga },
{ "6df20c50c1ab19799de9be7ae7716881", "fbdemo", Common::EN_USA, Common::kPlatformMacintosh },
{ "6e959d65358eedf9b68b81e304b97fa4", "tentacle", Common::DE_DEU, Common::kPlatformUnknown },
{ "6ea966b4d660c870b9ee790d1fbfc535", "monkey2", Common::ES_ESP, Common::kPlatformAmiga },
{ "6f0be328c64d689bb606d22a389e1b0f", "loom", Common::EN_USA, Common::kPlatformMacintosh },
- { "6f6ef668c608c7f534fea6e6d3878dde", "indy3EGA", Common::DE_DEU, Common::kPlatformPC },
+ { "6f6ef668c608c7f534fea6e6d3878dde", "indy3", Common::DE_DEU, Common::kPlatformPC },
{ "701246819d1a70573f41bf33fc19214f", "soccer", Common::EN_USA, Common::kPlatformWindows },
{ "7020931d5a2be0a49d68e7a1882363e4", "zak", Common::EN_USA, Common::kPlatformPC },
- { "71523b539491527d9860f4407faf0411", "monkeyega", Common::EN_USA, Common::kPlatformPC },
+ { "71523b539491527d9860f4407faf0411", "monkey", 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 },
@@ -199,8 +199,8 @@
{ "754feb59d3bf86b8a00840df74fd7b26", "f3-mdemo", Common::NL_NLD, Common::kPlatformWindows },
{ "75ba23fff4fd63fa446c02864f2a5a4b", "zak", Common::IT_ITA, Common::kPlatformPC },
{ "75bff95816b84672b877d22a911ab811", "freddi3", Common::RU_RUS, Common::kPlatformWindows },
- { "771bc18ec6f93837b839c992b211904b", "monkeyega", Common::DE_DEU, Common::kPlatformPC },
- { "77f5c9cc0986eb729c1a6b4c8823bbae", "zakTowns", Common::EN_USA, Common::kPlatformFMTowns },
+ { "771bc18ec6f93837b839c992b211904b", "monkey", Common::DE_DEU, Common::kPlatformPC },
+ { "77f5c9cc0986eb729c1a6b4c8823bbae", "zak", Common::EN_USA, Common::kPlatformFMTowns },
{ "780e4a0ae2ff17dc296f4a79543b44f8", "puttmoon", Common::UNK_LANG, Common::kPlatformPC },
{ "78bd5f036ea35a878b74e4f47941f784", "freddi4", Common::RU_RUS, Common::kPlatformWindows },
{ "7974365d3dc0f43a2748c975f91ff042", "monkey2", Common::ES_ESP, Common::kPlatformPC },
@@ -217,9 +217,9 @@
{ "8299d9b8a1b0e7b881bae7a9971dc5e2", "zak", Common::EN_USA, Common::kPlatformAtariST },
{ "8368f552b1e3eba559f8d559bcc4cadb", "freddi3", Common::UNK_LANG, Common::kPlatformUnknown },
{ "861e59ed72a1cd0e6d454f7ee7e2bf3d", "comi", Common::RU_RUS, Common::kPlatformUnknown },
- { "86be8ada36371d4fdc35659d0e912a26", "indy3EGA", Common::ES_ESP, Common::kPlatformPC },
+ { "86be8ada36371d4fdc35659d0e912a26", "indy3", Common::ES_ESP, Common::kPlatformPC },
{ "86c9902b7bec1a17926d4dae85beaa45", "airdemo", Common::EN_USA, Common::kPlatformWindows },
- { "870d1e3c86bc50846d808d14a36b4e08", "monkeyvga", Common::ES_ESP, Common::kPlatformAmiga },
+ { "870d1e3c86bc50846d808d14a36b4e08", "monkey", Common::ES_ESP, Common::kPlatformAmiga },
{ "87f6e8037b7cc996e13474b491a7a98e", "maniac", Common::IT_ITA, Common::kPlatformPC },
{ "8801fb4a1200b347f7a38523339526dd", "jungle", Common::EN_USA, Common::kPlatformWindows },
{ "883af4b0af4f77a92f1dcf1d0a283140", "tentacle", Common::ES_ESP, Common::kPlatformUnknown },
@@ -234,11 +234,11 @@
{ "8eb84cee9b429314c7f0bdcf560723eb", "monkey", Common::EN_USA, Common::kPlatformFMTowns },
{ "8ee63cafb1fe9d62aa0d5a23117e70e7", "freddi2", Common::EN_USA, Common::kPlatformUnknown },
{ "8f3758ff98c9c5d78e5d635222cad026", "atlantis", Common::IT_ITA, Common::kPlatformPC },
- { "8fec68383202d38c0d25e9e3b757c5df", "comidemo", Common::UNK_LANG, Common::kPlatformUnknown },
+ { "8fec68383202d38c0d25e9e3b757c5df", "comi", Common::UNK_LANG, Common::kPlatformUnknown },
{ "8ffd618a776a4c0d8922bb28b09f8ce8", "airdemo", Common::EN_USA, Common::kPlatformWindows },
{ "90a329d8ad5b7ce0690429e98cfbb32f", "funpack", Common::HB_ISR, Common::kPlatformPC },
{ "90c755e1c9b9b8a4129d37b2259d0655", "chase", Common::EN_USA, Common::kPlatformUnknown },
- { "910e31cffb28226bd68c569668a0d6b4", "monkeyega", Common::ES_ESP, Common::kPlatformPC },
+ { "910e31cffb28226bd68c569668a0d6b4", "monkey", Common::ES_ESP, Common::kPlatformPC },
{ "91469353f7be1b122fa88d23480a1320", "zak", Common::FR_FRA, Common::kPlatformAmiga },
{ "92b078d9d6d9d751da9c26b8b3075779", "tentacle", Common::FR_FRA, Common::kPlatformPC },
{ "92e7727e67f5cd979d8a1070e4eb8cb3", "puttzoo", Common::EN_USA, Common::kPlatformUnknown },
@@ -246,20 +246,20 @@
{ "96a3069a3c63caa7329588ce1fef41ee", "spyozon", Common::RU_RUS, Common::kPlatformUnknown },
{ "9708cf716ed8bcc9ff3fcfc69413b746", "puttputt", Common::EN_USA, Common::kPlatformPC },
{ "981e1e1891f2be7e25a01f50ae55a5af", "puttrace", Common::EN_USA, Common::kPlatformUnknown },
- { "98744fe66ff730e8c2b3b1f58803ab0b", "playfate", Common::EN_USA, Common::kPlatformPC },
+ { "98744fe66ff730e8c2b3b1f58803ab0b", "atlantis", Common::EN_USA, Common::kPlatformPC },
{ "99a3699f80b8f776efae592b44b9b991", "maniac", Common::FR_FRA, Common::kPlatformPC },
- { "99b6f822b0b2612415407865438697d6", "fate", Common::EN_USA, Common::kPlatformPC },
+ { "99b6f822b0b2612415407865438697d6", "atlantis", Common::EN_USA, Common::kPlatformPC },
{ "9bc548e179cdb0767009401c094d0895", "maniac", Common::DE_DEU, Common::kPlatformAmiga },
{ "9bd2a8f72613e715c199246dd511e10f", "atlantis", Common::ES_ESP, Common::kPlatformPC },
{ "9bda5fee51d2fda5253d02c642016bf4", "spyfox", Common::NL_NLD, Common::kPlatformWindows },
- { "9c0fee288ad564a7d25ec3e841810d79", "indy3EGA", Common::EN_USA, Common::kPlatformAmiga },
+ { "9c0fee288ad564a7d25ec3e841810d79", "indy3", Common::EN_USA, Common::kPlatformAmiga },
{ "9c143c5905055d5df7a0f014ab379aee", "moondemo", Common::EN_USA, Common::kPlatformWindows },
{ "9c92eeaf517a31b7221ec2546ab669fd", "puttmoon", Common::EN_USA, Common::kPlatformWindows },
{ "9cdd327c1034c046cb595d251c44da2f", "chase", Common::RU_RUS, Common::kPlatformWindows },
{ "9d4ab3e0e1d1ebc6ba8a6a4c470ed184", "spydemo", Common::EN_USA, Common::kPlatformWindows },
- { "9d7b67be003fea60be4dcbd193611936", "ftdemo", Common::EN_USA, Common::kPlatformMacintosh },
+ { "9d7b67be003fea60be4dcbd193611936", "ft", Common::EN_USA, Common::kPlatformMacintosh },
{ "9dc02577bf50d4cfaf3de3fbac06fbe2", "puttmoon", Common::EN_USA, Common::kPlatformMacintosh },
- { "9e5e0fb43bd22f4628719b7501adb717", "monkeyega", Common::FR_FRA, Common::kPlatformAtariST },
+ { "9e5e0fb43bd22f4628719b7501adb717", "monkey", Common::FR_FRA, Common::kPlatformAtariST },
{ "a194f15f51ee62badab74b9e7da97693", "bb2demo", Common::EN_USA, Common::kPlatformWindows },
{ "a28135a7ade38cc0208b04507c46efd1", "spyfox", Common::DE_DEU, Common::kPlatformWindows },
{ "a2bb6aa0537402c1b3c2ea899ccef64b", "smaller", Common::EN_USA, Common::kPlatformWindows },
@@ -274,18 +274,18 @@
{ "a9543ef0d79bcb47cd76ec197ad0a967", "puttmoon", Common::EN_USA, Common::kPlatformUnknown },
{ "a9f2f04b1ecaab9495b59befffe9bf88", "pj3-demo", Common::EN_USA, Common::kPlatformUnknown },
{ "aa6a91b7f6f119d1b7b1f2a4c9e24d59", "moondemo", Common::EN_USA, Common::kPlatformPC },
- { "aa7a07d94ae853f6460be4ce0a1bf530", "monkeyega", Common::FR_FRA, Common::kPlatformPC },
+ { "aa7a07d94ae853f6460be4ce0a1bf530", "monkey", Common::FR_FRA, Common::kPlatformPC },
{ "aa8a0cb65f3afbbe2c14c3f9f92775a3", "monkey", Common::FR_FRA, Common::kPlatformPC },
{ "aaa587701cde7e74692c68c1024b85eb", "racedemo", Common::NL_NLD, Common::kPlatformUnknown },
{ "ab0693e9324cfcf498fdcbb12acf8bb4", "puttcircus", Common::EN_USA, Common::kPlatformUnknown },
- { "ac1642b6edfb8521ca03760126f1c250", "dottdemo", Common::DE_DEU, Common::kPlatformPC },
+ { "ac1642b6edfb8521ca03760126f1c250", "tentacle", Common::DE_DEU, Common::kPlatformPC },
{ "ac62d50e39492ee3738b4e83a5ac780f", "freddi2", Common::NL_NLD, Common::kPlatformWindows },
{ "acad97ab1c6fc2a5b2d98abf6db4a190", "tentacle", Common::EN_USA, Common::kPlatformUnknown },
{ "ae94f110a14ce71fc515d5b648827a8f", "tentacle", Common::ES_ESP, Common::kPlatformPC },
{ "b23f7cd7c304d7dff08e92a96120d5b4", "zak", Common::EN_USA, Common::kPlatformPC },
{ "b250d0f9cc83f80ced56fe11a4fb057c", "maniac", Common::EN_USA, Common::kPlatformPC },
{ "b289a2a8cbedbf45786e0b4ad2f510f1", "samnmax", Common::IT_ITA, Common::kPlatformPC },
- { "b597e0403cc0002f69170e6caba7edd9", "indy3EGA", Common::EN_USA, Common::kPlatformPC },
+ { "b597e0403cc0002f69170e6caba7edd9", "indy3", Common::EN_USA, Common::kPlatformPC },
{ "b628506f7def772e40de0aa5440fb8e1", "activity", Common::EN_USA, Common::kPlatformWindows },
{ "b886b0a5d909c7158a914e1d7c1c6c65", "loom", Common::FR_FRA, Common::kPlatformPC },
{ "b8955d7d23b4972229060d1592489fef", "freddicove", Common::NL_NLD, Common::kPlatformWindows },
@@ -294,48 +294,48 @@
{ "bf8b52fdd9a69c67f34e8e9fec72661c", "farmdemo", Common::EN_USA, Common::kPlatformWindows },
{ "bfdf584b01503f0762baded581f6a0a2", "SoccerMLS", Common::EN_USA, Common::kPlatformWindows },
{ "c0039ad982999c92d0de81910d640fa0", "freddi", Common::NL_NLD, Common::kPlatformWindows },
- { "c13225cb1bbd3bc9fe578301696d8021", "game", Common::EN_USA, Common::kPlatformUnknown },
+ { "c13225cb1bbd3bc9fe578301696d8021", "monkey", Common::EN_USA, Common::kPlatformUnknown },
{ "c24c490373aeb48fbd54caa8e7ae376d", "loom", Common::DE_DEU, Common::kPlatformAtariST },
{ "c25755b08a8d0d47695e05f1e2111bfc", "f4-demo", Common::EN_USA, Common::kPlatformWindows },
{ "c30ef068add4277104243c31ce46c12b", "monkey2", Common::FR_FRA, Common::kPlatformAmiga },
- { "c3196c5349e53e387aaff1533d95e53a", "snmdemo", Common::EN_USA, Common::kPlatformPC },
+ { "c3196c5349e53e387aaff1533d95e53a", "samnmax", Common::EN_USA, Common::kPlatformPC },
{ "c3b22fa4654bb580b20325ebf4174841", "puttzoo", Common::NL_NLD, Common::kPlatformWindows },
{ "c3df37df9d3b481b45f75283a9907c47", "loom", Common::IT_ITA, Common::kPlatformPC },
{ "c4787c3e8b5e2dfda90850ee800af00f ", "zak", Common::FR_FRA, Common::kPlatformPC },
{ "c4ffae9fac495475d6bc3343ccc8faf9", "Soccer2004", Common::EN_USA, Common::kPlatformUnknown },
- { "c5d10e190d4b4d59114b824f2fdbd00e", "loomTowns", Common::EN_USA, Common::kPlatformFMTowns },
+ { "c5d10e190d4b4d59114b824f2fdbd00e", "loom", Common::EN_USA, Common::kPlatformFMTowns },
{ "c63ee46143ba65f9ce14cf539ca51bd7", "atlantis", Common::EN_USA, Common::kPlatformPC },
{ "c6907d44f1166941d982864cd42cdc89", "pajama2", Common::DE_DEU, Common::kPlatformWindows },
- { "c7890e038806df2bb5c0c8c6f1986ea2", "monkeyvga", Common::EN_USA, Common::kPlatformPC },
- { "c7be10f775404fd9785a8b92a06d240c", "indy4", Common::EN_USA, Common::kPlatformFMTowns },
- { "c83079157ec765a28de445aec9768d60", "dottdemo", Common::EN_USA, Common::kPlatformPC },
+ { "c7890e038806df2bb5c0c8c6f1986ea2", "monkey", Common::EN_USA, Common::kPlatformPC },
+ { "c7be10f775404fd9785a8b92a06d240c", "atlantis", Common::EN_USA, Common::kPlatformFMTowns },
+ { "c83079157ec765a28de445aec9768d60", "tentacle", Common::EN_USA, Common::kPlatformPC },
{ "c8aac5e3e701874e2fa4117896f9e1b1", "freddemo", Common::EN_USA, Common::kPlatformMacintosh },
{ "cb1559e8405d17a5a278a6b5ad9338d1", "f3-mdemo", Common::EN_USA, Common::kPlatformUnknown },
- { "cc8ba2b0df2f9c450bcf055fe2711979", "snmdemo", Common::DE_DEU, Common::kPlatformPC },
- { "cd9c05e755d7bf8e9b9590ad1ebe273e", "digdemo", Common::EN_USA, Common::kPlatformMacintosh },
+ { "cc8ba2b0df2f9c450bcf055fe2711979", "samnmax", Common::DE_DEU, Common::kPlatformPC },
+ { "cd9c05e755d7bf8e9b9590ad1ebe273e", "dig", Common::EN_USA, Common::kPlatformMacintosh },
{ "cdd760228cf1010c2903f37e788ea31c", "zak", Common::DE_DEU, Common::kPlatformPC },
- { "ce3edc99cd4f478c5b37104d70c68ca5", "zakTowns", Common::JA_JPN, Common::kPlatformFMTowns },
- { "ce6a4cef315b20fef58a95bc40a2d8d3", "monkeyega", Common::FR_FRA, Common::kPlatformPC },
+ { "ce3edc99cd4f478c5b37104d70c68ca5", "zak", Common::JA_JPN, Common::kPlatformFMTowns },
+ { "ce6a4cef315b20fef58a95bc40a2d8d3", "monkey", Common::FR_FRA, Common::kPlatformPC },
{ "ce7733f185b838e248927c7ba1a04204", "maniac", Common::FR_FRA, Common::kPlatformAmiga },
- { "ce7fd0c382389a6791fc3e199c117ef4", "indy3EGA", Common::ES_ESP, Common::kPlatformPC },
+ { "ce7fd0c382389a6791fc3e199c117ef4", "indy3", Common::ES_ESP, Common::kPlatformPC },
{ "cea91e3dd47f2518ea418e41611aa77f", "spyfox2", Common::RU_RUS, Common::kPlatformUnknown },
{ "cf8d13446ec6cb6222287a925fd47c1d", "baseball", Common::EN_USA, Common::kPlatformWindows },
{ "cf90b4db5486ef798db78fe6fbf897e5", "pj3-demo", Common::EN_USA, Common::kPlatformWindows },
{ "d06fbe28818fef7bfc45c2cdf0c0849d", "zak", Common::DE_DEU, Common::kPlatformPC },
- { "d0b531227a27c6662018d2bd05aac52a", "monkeyvga", Common::DE_DEU, Common::kPlatformPC },
+ { "d0b531227a27c6662018d2bd05aac52a", "monkey", Common::DE_DEU, Common::kPlatformPC },
{ "d37c55388294b66e53e7ced3af88fa68", "ff2-demo", Common::EN_USA, Common::kPlatformUnknown },
{ "d43352a805d78b5f4936c6d7779bf575", "samnmax", Common::RU_RUS, Common::kPlatformPC },
{ "d4b8ee426b1afd3e53bc0cf020418cf6", "dog", Common::EN_USA, Common::kPlatformWindows },
{ "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", Common::RU_RUS, Common::kPlatformWindows },
{ "d4e79c3d8645b8266cd78c325bc35154", "pajama2", Common::EN_USA, Common::kPlatformUnknown },
{ "d62047a6729349ab36f7ee065bf26509", "dig", Common::RU_RUS, Common::kPlatformUnknown },
- { "d62d248c3df6ec177405e2cb23d923b2", "indy3EGA", Common::IT_ITA, Common::kPlatformPC },
+ { "d62d248c3df6ec177405e2cb23d923b2", "indy3", Common::IT_ITA, Common::kPlatformPC },
{ "d6dd0646404768a63e963891a96daadd", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
{ "d7ab7cd6105546016e6a0d46fb36b964", "pjs-demo", Common::EN_USA, Common::kPlatformUnknown },
{ "d8323015ecb8b10bf53474f6e6b0ae33", "dig", Common::UNK_LANG, Common::kPlatformUnknown },
{ "d8d07efcb88f396bee0b402b10c3b1c9", "maniac", Common::EN_USA, Common::kPlatformNES },
{ "d917f311a448e3cc7239c31bddb00dd2", "samnmax", Common::EN_USA, Common::kPlatformUnknown },
- { "d9d0dd93d16ab4dec55cabc2b86bbd17", "samdemo", Common::EN_USA, Common::kPlatformPC },
+ { "d9d0dd93d16ab4dec55cabc2b86bbd17", "samnmax", Common::EN_USA, Common::kPlatformPC },
{ "da09e666fc8f5b78d7b0ac65d1a3b56e", "monkey2", Common::EN_USA, Common::kPlatformFMTowns },
{ "da6269b18fcb08189c0aa9c95533cce2", "monkey", Common::IT_ITA, Common::kPlatformPC },
{ "da669b20271b85182e9c17a2a37ea02e", "monkey2", Common::DE_DEU, Common::kPlatformAmiga },
@@ -343,7 +343,7 @@
{ "de4efb910210736813c9a1185384bace", "zoodemo", Common::EN_USA, Common::kPlatformWindows },
{ "debe337f73d660e951ece7c1f1c81add", "zak", Common::EN_USA, Common::kPlatformPC },
{ "defb8cb9ec4b0f91acfb6b61c6129ad9", "PuttTime", Common::RU_RUS, Common::kPlatformWindows },
- { "df03ee021aa9b81d90cab9c26da07614", "indy3EGA", Common::IT_ITA, Common::kPlatformAmiga },
+ { "df03ee021aa9b81d90cab9c26da07614", "indy3", Common::IT_ITA, Common::kPlatformAmiga },
{ "df047cc4792150f601290357566d36a6", "freddi", Common::EN_USA, Common::kPlatformUnknown },
{ "e01acc8c12ef44e8f778fe87e5f90f4e", "fbpack", Common::EN_USA, Common::kPlatformUnknown },
{ "e144f5f49d9241d2a9dee2576b3d09cb", "airdemo", Common::EN_USA, Common::kPlatformWindows },
@@ -353,7 +353,7 @@
{ "e41de1c2a15abbcdbf9977e2d7e8a340", "freddi2", Common::RU_RUS, Common::kPlatformWindows },
{ "e534d29afb3c6e0ee9dc3d53c5956714", "atlantis", Common::DE_DEU, Common::kPlatformAmiga },
{ "e63a0b9249b5ca4cc4d3ac34305ae360", "freddi", Common::NB_NOR, Common::kPlatformWindows },
- { "e689bdf67f98b1d760ce4487ec0e8d06", "indy3EGA", Common::FR_FRA, Common::kPlatformAmiga },
+ { "e689bdf67f98b1d760ce4487ec0e8d06", "indy3", Common::FR_FRA, Common::kPlatformAmiga },
{ "e6cd81b25ab1453a8a6d3482118c391e", "pass", Common::EN_USA, Common::kPlatformPC },
{ "e72bb4c2b613db2cf50f89ff6350e70a", "ft", Common::ES_ESP, Common::kPlatformUnknown },
{ "e781230da44a44e2f0770edb2b3b3633", "maniac", Common::EN_USA, Common::kPlatformAmiga },
@@ -376,11 +376,11 @@
{ "f7711f9264d4d43c2a1518ec7c10a607", "pajama3", Common::EN_USA, Common::kPlatformWindows },
{ "f79e60c17cca601e411f1f75e8ee9b5a", "spyfox2", Common::EN_USA, Common::kPlatformUnknown },
{ "fa127d7c4bb47d05bb1c33ddcaa9f767", "loom", Common::DE_DEU, Common::kPlatformPC },
- { "fb66aa42de21675116346213f176a366", "monkeyvga", Common::IT_ITA, Common::kPlatformAmiga },
+ { "fb66aa42de21675116346213f176a366", "monkey", Common::IT_ITA, Common::kPlatformAmiga },
{ "fbbbb38a81fc9d6a61d509278390a290", "farm", Common::EN_USA, Common::kPlatformMacintosh },
{ "fbdd947d21e8f5bac6d6f7a316af1c5a", "spydemo", Common::EN_USA, Common::kPlatformUnknown },
{ "fc53ce0e5f6562b1c1e1b4b8203acafb", "samnmax", Common::ES_ESP, Common::kPlatformPC },
- { "fc6b6148e80d67939d9a18697c0f626a", "monkeyega", Common::DE_DEU, Common::kPlatformPC },
+ { "fc6b6148e80d67939d9a18697c0f626a", "monkey", Common::DE_DEU, Common::kPlatformPC },
{ "fc8d197a22146e74766e9cb0cfcaf1da", "ff2-demo", Common::EN_USA, Common::kPlatformUnknown },
{ "fcb78ebecab2757264c590890c319cc5", "PuttTime", Common::NL_NLD, Common::kPlatformWindows },
{ "fe381e45117878b1e942cb876b050fd6", "ft", Common::EN_USA, Common::kPlatformMacintosh },
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -d -r1.560 -r1.561
--- scumm.cpp 31 Aug 2005 20:26:44 -0000 1.560
+++ scumm.cpp 4 Sep 2005 12:42:18 -0000 1.561
@@ -105,6 +105,48 @@
};
+struct ObsoleteTargets {
+ const char *from;
+ const char *to;
+ const char *platform;
+
+ GameSettings toGameSettings() const {
+ GameSettings dummy = { from, "Obsolete Target", GF_MULTIPLE_VERSIONS };
+ return dummy;
+ }
+};
+
+static ObsoleteTargets obsoleteTargetsTable[] = {
+ "comidemo", "comi", NULL,
+ "digdemo", "dig", NULL,
+ "digdemoMac", "dig", "macintosh",
+ "dottdemo", "tentacle", NULL,
+ "ftMac", "ft", "macintosh",
+ "ftpcdemo", "ft", NULL,
+ "ftdemo", "ft", "macintosh",
+ "game", "monkey", NULL,
+ "indy3ega", "indy3", NULL,
+ "indy3towns", "indy3", "fmtowns",
+ "indy4", "atlantis", "fmtowns",
+ "indydemo", "atlantis", "fmtowns",
+ "loomcd", "loom", NULL,
+ "loomTowns", "loom", "fmtowns",
+ "mi2demo", "monkey2", NULL,
+ "monkey1", "monkey", NULL,
+ "monkeyEGA", "monkey", NULL,
+ "monkeyVGA", "monkey", NULL,
+ "playfate", "atlantis", NULL,
+ "samnmax-alt", "samnmax", NULL,
+ "samnmaxMac", "samnmax", "macintosh",
+ "samdemo", "samnmax", NULL,
+ "samdemoMac", "samnmax", "macintosh",
+ "snmdemo", "samnmax", NULL,
+ "snmidemo", "samnmax", NULL,
+ "tentacleMac", "tentacle", "macintosh",
+ "zakTowns", "zak", "fmtowns",
+ NULL, NULL, NULL
+};
+
static const ScummGameSettings scumm_settings[] = {
/* Scumm Version 1 */
/* Scumm Version 2 */
@@ -115,109 +157,48 @@
GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
/* Scumm Version 3 */
- {"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, 0, MDT_PCSPK | MDT_ADLIB,
- GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformPC, 0, 0},
- {"indy3Towns", "Indiana Jones and the Last Crusade (FM-TOWNS)", GID_INDY3, 3, 0, MDT_TOWNS,
- GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
- {"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3, 3, 0, MDT_PCSPK | MDT_ADLIB,
- GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, Common::kPlatformPC, 0, 0},
-
- {"zakTowns", "Zak McKracken and the Alien Mindbenders (FM-TOWNS)", GID_ZAK256, 3, 0, MDT_TOWNS,
- GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"indy3", "Indiana Jones and the Last Crusade", GID_INDY3, 3, 0, MDT_PCSPK | MDT_ADLIB,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
{"loom", "Loom", GID_LOOM, 3, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
- GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformPC, 0, 0},
- {"loomTowns", "Loom (FM Towns)", GID_LOOM, 3, 0, MDT_TOWNS,
- GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
/* Scumm Version 4 */
- {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
- GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
{"pass", "Passport to Adventure", GID_PASS, 4, 0, MDT_PCSPK | MDT_ADLIB,
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
/* Scumm version 5, small header -- we treat these as V4 games, since internally
they really are much closer to the V4 games than to all other V5 games. */
- {"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
- GF_SMALL_HEADER | GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"loomcd", "Loom (256 color CD version)", GID_LOOM256, 4, 0, MDT_NONE,
- GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"monkey", "Monkey Island 1", GID_MONKEY_VGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
/* Scumm version 5 */
- {"monkey", "Monkey Island 1", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
- GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
- {"monkey1", "Monkey Island 1 (alt)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
- {"game", "Monkey Island 1 (SegaCD version)", GID_MONKEY_SEGA, 5, 0, MDT_NONE,
- GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
{"monkey2", "Monkey Island 2: LeChuck's revenge", GID_MONKEY2, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"mi2demo", "Monkey Island 2: LeChuck's revenge (Demo)", GID_MONKEY2, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
{"atlantis", "Indiana Jones and the Fate of Atlantis", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"playfate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"fate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"indy4", "Indiana Jones and the Fate of Atlantis (FM-TOWNS)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformFMTowns, 0, 0},
- {"indydemo", "Indiana Jones and the Fate of Atlantis (FM-TOWNS Demo)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformFMTowns, 0, 0},
+ GF_USE_KEY | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
/* Scumm Version 6 */
{"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"tentacleMac", "Day Of The Tentacle", GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformMacintosh, "tentacle", "Day Of The Tentacle Data"},
- {"dottdemo", "Day Of The Tentacle (Demo)", GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
{"samnmax", "Sam & Max", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
GF_USE_KEY, Common::kPlatformPC, 0, 0},
- // This target is obsolete now. Kept here only for compatibility
- {"samnmax-alt", "Sam & Max (alt)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, "samnmax", "samnmax.000"},
- {"samnmaxMac", "Sam & Max (Mac)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformMacintosh, "samnmax", "Sam & Max Data"},
- {"samdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
- {"samdemoMac", "Sam & Max (Mac Demo)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformMacintosh, "samdemo", "Sam & Max Demo Data"},
- {"snmdemo", "Sam & Max (Demo)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, "snmdemo.sm0"},
- {"snmidemo", "Sam & Max (Interactive WIP Demo)", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,
- GF_USE_KEY, Common::kPlatformPC, 0, 0},
// {"test", "Test demo game", GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES, Common::kPlatformUnknown, 0, 0},
#ifndef DISABLE_SCUMM_7_8
/* Scumm Version 7 */
{"ft", "Full Throttle", GID_FT, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, Common::kPlatformPC, 0, 0},
- {"ftMac", "Full Throttle (Mac)", GID_FT, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, Common::kPlatformMacintosh, "ft", "Full Throttle Data"},
- {"ftdemo", "Full Throttle (Mac Demo)", GID_FT, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformMacintosh, 0, "Full Throttle Demo Data"},
- {"ftpcdemo", "Full Throttle (PC Demo)", GID_FT, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformPC, "ft", "ft.000"},
-
+ GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_MULTIPLE_VERSIONS, Common::kPlatformPC, 0, 0},
{"dig", "The Dig", GID_DIG, 7, 0, MDT_NONE,
GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, Common::kPlatformPC, 0, 0},
- {"digMac", "The Dig (Mac)", GID_DIG, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, Common::kPlatformMacintosh, "dig", "The Dig Data"},
- {"digdemo", "The Dig (Demo)", GID_DIG, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformPC, "dig", "dig.la0"},
- {"digdemoMac", "The Dig (Mac Demo)", GID_DIG, 7, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformMacintosh, "dig", "The Dig Demo Data"},
#ifndef __PALM_OS__
/* Scumm Version 8 */
{"comi", "The Curse of Monkey Island", GID_CMI, 8, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, Common::kPlatformWindows, 0, 0},
- {"comidemo", "The Curse of Monkey Island (Demo)", GID_CMI, 8, 0, MDT_NONE,
- GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, Common::kPlatformWindows, "comi", "COMI.LA0"},
+ GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_MULTIPLE_VERSIONS, Common::kPlatformWindows, 0, 0},
#endif
#endif
@@ -430,6 +411,9 @@
{"2e85f7aa054930c692a5b1bed1dfc295", "Backyard Football 2002 (Demo Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformUnknown, 0, 0}, // Football2002
+ {"8fec68383202d38c0d25e9e3b757c5df", "The Curse of Monkey Island (Demo)", GID_CMI, 8, 0, MDT_NONE,
+ GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, Common::kPlatformWindows, 0, 0},
+
{"179879b6e35c1ead0d93aab26db0951b", "Fatty Bear's Birthday Surprise (Windows)", GID_FBEAR, 6, 70, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
{"22c9eb04455440131ffc157aeb8d40a8", "Fatty Bear's Birthday Surprise (Windows Demo)", GID_FBEAR, 6, 70, MDT_NONE,
@@ -477,11 +461,35 @@
{"4dbff3787aedcd96b0b325f2d92d7ad9", "Freddi Fish and Luther's Maze Madness (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
+ {"9d7b67be003fea60be4dcbd193611936", "Full Throttle (Mac Demo)", GID_FT, 7, 0, MDT_NONE,
+ GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformMacintosh, 0, "Full Throttle Demo Data"},
+ {"32a433dea56b86a55b59e4ff7d755711", "Full Throttle (PC Demo)", GID_FT, 7, 0, MDT_NONE,
+ GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformPC, 0, 0},
+
+ {"1875b90fade138c9253a8e967007031a", "Indiana Jones and the Last Crusade (VGA)", GID_INDY3, 3, 0, MDT_PCSPK | MDT_ADLIB,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, Common::kPlatformPC, 0, 0},
+ {"399b217b0c8d65d0398076da486363a9", "Indiana Jones and the Last Crusade (VGA De)", GID_INDY3, 3, 0, MDT_PCSPK | MDT_ADLIB,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, Common::kPlatformPC, 0, 0},
+ {"17b5d5e6af4ae89d62631641d66d5a05", "Indiana Jones and the Last Crusade (VGA It)", GID_INDY3, 3, 0, MDT_PCSPK | MDT_ADLIB,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS, Common::kPlatformPC, 0, 0},
+
+ {"04687cdf7f975a89d2474929f7b80946", "Indiana Jones and the Last Crusade (FM-TOWNS)", GID_INDY3, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"3a0c35f3c147b98a2bdf8d400cfc4ab5", "Indiana Jones and the Last Crusade (FM-TOWNS Jp)", GID_INDY3, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+
{"86c9902b7bec1a17926d4dae85beaa45", "Let's Explore the Airport with Buzzy (Demo) (puttputt cd)", GID_HEGAME, 6, 71, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
{"bf8b52fdd9a69c67f34e8e9fec72661c", "Let's Explore the Farm with Buzzy (Demo) (puttputt cd)", GID_HEGAME, 6, 71, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
+ {"5d88b9d6a88e6f8e90cded9d01b7f082", "Loom (256 color CD version)", GID_LOOM256, 4, 0, MDT_NONE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"c5d10e190d4b4d59114b824f2fdbd00e", "Loom (FM-TOWNS)", GID_LOOM, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"31b8fda4c8c7413fa6b39997e776eba4", "Loom (FM-TOWNS Jp)", GID_LOOM, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+
{"d8d07efcb88f396bee0b402b10c3b1c9", "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, 0, 0},
{"81bbfa181184cb494e7a81dcfa94fbd9", "Maniac Mansion (NES F)", GID_MANIAC, 1, 0, MDT_NONE,
@@ -546,6 +554,45 @@
{"d4b8ee426b1afd3e53bc0cf020418cf6", "Putt-Putt and Pep's Dog on a Stick (Updated)", GID_HEGAME, 6, 98, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
+ {"1d05cd189e4908f79b57e78a4402f292", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"49210e124e4c2b30f1290a9ef6306301", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"fc6b6148e80d67939d9a18697c0f626a", "Monkey Island 1 (EGA De)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"ce6a4cef315b20fef58a95bc40a2d8d3", "Monkey Island 1 (EGA Fr)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"aa7a07d94ae853f6460be4ce0a1bf530", "Monkey Island 1 (EGA Fr)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"1dd3c11ea4439adfe681e4e405b624e1", "Monkey Island 1 (EGA Fr)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"477dbafbd66a53c98416dc01aef019ad", "Monkey Island 1 (EGA It)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"910e31cffb28226bd68c569668a0d6b4", "Monkey Island 1 (EGA Sp)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"9e5e0fb43bd22f4628719b7501adb717", "Monkey Island 1 (Atari Fr)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"71523b539491527d9860f4407faf0411", "Monkey Island 1 (Demo)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+ {"771bc18ec6f93837b839c992b211904b", "Monkey Island 1 (Demo De)", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
+ GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR, Common::kPlatformPC, 0, 0},
+
+ {"2d1e891fe52df707c30185e52c50cd92", "Monkey Island 1 (CD)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"305d3dd57c96c65b017bc70c8c7cfb5e", "Monkey Island 1 (CD De)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"f049e38c1f8302b5db6170f1872af89a", "Monkey Island 1 (CD Sp)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"da6269b18fcb08189c0aa9c95533cce2", "Monkey Island 1 (CD It)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"aa8a0cb65f3afbbe2c14c3f9f92775a3", "Monkey Island 1 (CD Fr)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+ {"2ccd8891ce4d3f1a334d21bff6a88ca2", "Monkey Island 1 (Mac CD)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+
+ {"c13225cb1bbd3bc9fe578301696d8021", "Monkey Island 1 (SegaCD)", GID_MONKEY_SEGA, 5, 0, MDT_NONE,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC, 0, 0},
+
{"3de99ef0523f8ca7958faa3afccd035a", "Spyfox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows, 0, 0},
{"9bda5fee51d2fda5253d02c642016bf4", "Spyfox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 98, MDT_NONE,
@@ -566,6 +613,20 @@
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformPC, 0, 0},
{"7020931d5a2be0a49d68e7a1882363e4", "Zak McKracken and the Alien Mindbenders (v1)", GID_ZAK, 1, 0, MDT_PCSPK,
GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformPC, 0, 0},
+
+ {"2d4536a56e01da4b02eb021e7770afa2", "Zak McKracken and the Alien Mindbenders (FM-TOWNS)", GID_ZAK256, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"ce3edc99cd4f478c5b37104d70c68ca5", "Zak McKracken and the Alien Mindbenders (FM-TOWNS Jp)", GID_ZAK256, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"1ca86e2cf9aaa2068738a1e5ba477e60", "Zak McKracken and the Alien Mindbenders (FM-TOWNS Jp)", GID_ZAK256, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+
+ {"2d388339d6050d8ccaa757b64633954e", "Indy/Loom Demo (FM-TOWNS)", GID_ZAK256, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"77f5c9cc0986eb729c1a6b4c8823bbae", "Zak/Loom Demo (FM-TOWNS)", GID_ZAK256, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
+ {"3938ee1aa4433fca9d9308c9891172b1", "Indy/Zak Demo (FM-TOWNS)", GID_ZAK256, 3, 0, MDT_TOWNS,
+ GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
#endif
{NULL, NULL, 0, 0, MDT_NONE, 0, 0, Common::kPlatformUnknown, 0, 0}
};
@@ -594,6 +655,10 @@
{ "00.LFL", "zak1.d64", kGenAsIs }, // these
{ "01.LFL", "zak2.d64", kGenAsIs }, // lines
{ "airdemo", "Airport Demo", kGenMac},
+ { "atlantis", "fate", kGenPC},
+ { "atlantis", "playfate", kGenPC},
+ { "atlantis", "indy4", kGenPC},
+ { "atlantis", "indydemo", kGenPC},
{ "balloon", "Balloon-O-Rama", kGenMac},
{ "baseball", "BaseBall", kGenMac},
{ "baseball2001", "Baseball 2001", kGenMac},
@@ -604,7 +669,8 @@
{ "circdemo", "Putt Circus Demo", kGenMac },
{ "circdemo", "Putt Circus Demo", kGenMac},
{ "dig.la0", "The Dig Data", kGenAsIs},
- { "digdemo.la0", "The Dig Demo Data", kGenAsIs},
+ { "dig.la0", "The Dig Demo Data", kGenAsIs},
+ { "dig", "digdemo", kGenPC},
{ "dog", "Dog on a Stick", kGenMac},
{ "f3-mdemo", "F3-mdemo", kGenMac },
{ "f3-mdemo", "F3-Mdemo", kGenMac },
@@ -638,12 +704,16 @@
{ "ft.la0", "Full Throttle Demo Data", kGenAsIs},
{ "ft.la0", "Vollgas Data", kGenAsIs},
{ "ft.la0", "Vollgas Demo Data", kGenAsIs},
+ { "ft.la0", "ft.000", kGenAsIs},
+ { "ft.la0", "ftdemo.000", kGenAsIs},
+ { "ft", "ftdemo", kGenPC },
{ "kinddemo", "Kinddemo", kGenMac },
{ "kinddemo", "KindDemo", kGenMac },
{ "lost", "Lost and Found", kGenMac},
{ "maze", "Maze Madness", kGenMac},
{ "monkey", "monkey1", kGenPC},
{ "monkey", "monkeyk", kGenPC}, // FM-TOWNS Jap
+ { "monkey2", "mi2demo", kGenPC},
{ "moondemo", "Putt-Putt Moon Demo", kGenMacNoParens },
{ "mustard", "Mustard", kGenMac},
{ "pajama", "Pajama Sam", kGenMac},
@@ -675,6 +745,9 @@
{ "samnmax.000", "Sam & Max Demo Data", kGenAsIs},
{ "samnmax.000", "samnmax.sm0", kGenAsIs }, // Fixes MD5 detection
{ "samnmax", "ramnmax", kGenPC }, // Used in some releases of Russian Sam'n'Max
+ { "samnmax", "samdemo", kGenPC },
+ { "samnamx", "snmdemo", kGenPC },
+ { "samnmax", "snmidemo", kGenPC },
{ "SamsFunShop", "Sam's FunShop", kGenMac },
{ "sf2-demo", "sf2demo", kGenPC },
{ "sf2-demo", "Spy Fox 2 - Demo", kGenMac },
@@ -691,6 +764,7 @@
{ "spyozon", "SPYFoxOZU", kGenPC },
{ "spyozon", "SpyOzon", kGenMac },
{ "tentacle.000", "Day Of The Tentacle Data", kGenAsIs},
+ { "tentacle", "dottdemo", kGenPC},
{ "thinker1", "Thinker1", kGenMac },
{ "thinkerk", "ThinkerK", kGenMac },
{ "timedemo", "TIJDDEMO", kGenPC },
@@ -2551,11 +2625,17 @@
GameList Engine_SCUMM_gameList() {
const ScummGameSettings *g = scumm_settings;
+ const ObsoleteTargets *o = obsoleteTargetsTable;
GameList games;
while (g->name) {
games.push_back(g->toGameSettings());
g++;
}
+
+ while (o->from) {
+ games.push_back(o->toGameSettings());
+ o++;
+ }
return games;
}
@@ -2842,7 +2922,10 @@
break;
case kGenPC:
- snprintf(buf, bufsize, "%s%s", substResFileNameTable[i].macName, ext);
+ if (ext)
+ snprintf(buf, bufsize, "%s%s", substResFileNameTable[i].macName, ext);
+ else
+ strncpy(buf, substResFileNameTable[i].macName, bufsize);
break;
case kGenAsIs:
@@ -2863,6 +2946,22 @@
Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
Engine *engine;
+ const ObsoleteTargets *o = obsoleteTargetsTable;
+ while (o->from) {
+ if (!scumm_stricmp(detector->_game.name, o->from)) {
+ detector->_game.name = o->to;
+
+ ConfMan.set("gameid", o->to);
+
+ if (o->platform)
+ ConfMan.set("platform", o->platform);
+
+ warning("Target upgraded from %s to %s", o->from, o->to);
+ ConfMan.flushToDisk();
+ break;
+ }
+ o++;
+ }
const ScummGameSettings *g = scumm_settings;
while (g->name) {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -d -r1.474 -r1.475
--- sound.cpp 4 Sep 2005 04:18:36 -0000 1.474
+++ sound.cpp 4 Sep 2005 12:42:19 -0000 1.475
@@ -1134,6 +1134,7 @@
};
char buf[256];
+ char buf1[128];
ScummFile *file = new ScummFile();
_offsetTable = NULL;
@@ -1144,6 +1145,14 @@
const char *basename[3] = { 0, 0, 0 };
basename[0] = _vm->getGameName();
basename[1] = "monster";
+
+ if (_vm->_substResFileNameIndex > 0) {
+
+ strcpy(buf, basename[0]);
+ _vm->generateSubstResFileName(buf, buf1, sizeof(buf1));
+ strcpy(buf, buf1);
+ basename[2] = buf1;
+ }
for (int j = 0; basename[j] && !file->isOpen(); ++j) {
for (int i = 0; extensions[i].ext; ++i) {
@@ -1163,8 +1172,6 @@
}
if (_vm->_substResFileNameIndex > 0) {
- char buf1[128];
-
_vm->generateSubstResFileName(buf, buf1, sizeof(buf1));
strcpy(buf, buf1);
}
More information about the Scummvm-git-logs
mailing list