[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.307.2.4,2.307.2.5 scumm-md5.h,2.107.2.7,2.107.2.8 scumm.cpp,1.603.2.21,1.603.2.22 scumm.h,1.647.2.7,1.647.2.8

kirben kirben at users.sourceforge.net
Wed Dec 21 03:38:04 CET 2005 

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3102/scumm

Modified Files:
      Tag: branch-0-8-0
	script_v72he.cpp scumm-md5.h scumm.cpp scumm.h 
Log Message:

Backport md5 updates.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.307.2.4
retrieving revision 2.307.2.5
diff -u -d -r2.307.2.4 -r2.307.2.5
--- script_v72he.cpp	26 Oct 2005 06:47:21 -0000	2.307.2.4
+++ script_v72he.cpp	21 Dec 2005 11:37:28 -0000	2.307.2.5
@@ -1760,10 +1760,18 @@
 
 	// There are Macintosh specific versions of HE7.2 games.
 	if (_heversion >= 80 && _platform == Common::kPlatformMacintosh) {
-		char buf1[128];
-
-		generateSubstResFileName((char *)filename, buf1, sizeof(buf1));
-		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);
+			}
+		}
 	}
 
 	int r = convertFilePath(filename);

Index: scumm-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm-md5.h,v
retrieving revision 2.107.2.7
retrieving revision 2.107.2.8
diff -u -d -r2.107.2.7 -r2.107.2.8
--- scumm-md5.h	18 Nov 2005 23:49:07 -0000	2.107.2.7
+++ scumm-md5.h	21 Dec 2005 11:37:28 -0000	2.107.2.8
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Thu Nov 17 23:17:13 2005
+  This file was generated by the md5table tool on Mon Dec 19 09:57:03 2005
   DO NOT EDIT MANUALLY!
  */
 
@@ -18,6 +18,7 @@
 	{ "04401d747f1a2c1c4b388daff71ed378", "ft", Common::DE_DEU, Common::kPlatformMacintosh },
 	{ "04687cdf7f975a89d2474929f7b80946", "indy3", Common::EN_USA, Common::kPlatformFMTowns },
 	{ "0557df19f046a84c2fdc63507c6616cb", "farm", Common::NL_NLD, Common::kPlatformWindows },
+	{ "055ffe4f47753e47594ac67823220c54", "puttrace", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "06b187468113f9ae5a400b148a847fac", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "07433205acdca3bc553d0e731588b35f", "airport", Common::EN_USA, Common::kPlatformWindows },
 	{ "07b810e37be7489263f7bc7627d4765d", "freddi4", Common::RU_RUS, Common::kPlatformWindows },
@@ -31,6 +32,7 @@
 	{ "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::kPlatformUnknown },
 	{ "0cccfa5223099a60e76cfcca57a1a141", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
 	{ "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", Common::ES_ESP, Common::kPlatformPC },
 	{ "0e4c5d54a0ad4b26132e78b5ea76642a", "samnmax", Common::EN_USA, Common::kPlatformPC },
@@ -88,12 +90,14 @@
 	{ "28ef68ee3ed76d7e2ee8ee13c15fbd5b", "loom", Common::EN_USA, Common::kPlatformPC },
 	{ "2a208ffbcd0e83e86f4356e6f64aa6e1", "loom", Common::ES_ESP, Common::kPlatformPC },
 	{ "2a41b53cf1a90b6e6f26c10cc6041084", "tentacle", Common::EN_USA, Common::kPlatformMacintosh },
+	{ "2a446817ffcabfef8716e0c456ecaf81", "puttzoo", Common::DE_DEU, Common::kPlatformWindows },
 	{ "2ccd8891ce4d3f1a334d21bff6a88ca2", "monkey", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "2d1e891fe52df707c30185e52c50cd92", "monkey", Common::EN_USA, Common::kPlatformPC },
 	{ "2d388339d6050d8ccaa757b64633954e", "zak", Common::EN_USA, Common::kPlatformFMTowns },
 	{ "2d4536a56e01da4b02eb021e7770afa2", "zak", Common::EN_USA, Common::kPlatformFMTowns },
 	{ "2d9d46f23cb07bbc90b8ad464d3e4ff8", "atlantis", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "2e85f7aa054930c692a5b1bed1dfc295", "football", Common::EN_USA, Common::kPlatformUnknown },
+	{ "2e8a1f76ea33bc5e04347646feee173d", "pajama3", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "2fe369ad70f52a8cf7ad6077ee64f81a", "loom", Common::DE_DEU, Common::kPlatformAmiga },
 	{ "305d3dd57c96c65b017bc70c8c7cfb5e", "monkey", Common::DE_DEU, Common::kPlatformPC },
 	{ "30ba1e825d4ad2b448143ae8df18482a", "pajama2", Common::NL_NLD, Common::kPlatformUnknown },
@@ -168,6 +172,7 @@
 	{ "566165a7338fa11029e7c14d94fa70d0", "freddi", Common::EN_USA, Common::kPlatformWindows },
 	{ "5798972220cd458be2626d54c80f71d7", "atlantis", Common::IT_ITA, Common::kPlatformAmiga },
 	{ "57b0d89af79befe1cabce3bece869e7f", "tentacle", Common::DE_DEU, Common::kPlatformPC },
+	{ "58436e634f4fae1d9973591c2ffa1fcb", "spyfox", Common::EN_USA, Common::kPlatformUnknown },
 	{ "589601b676c98b1c0c987bc031ab68b3", "chase", Common::EN_USA, Common::kPlatformUnknown },
 	{ "58fdf4c7ad13540a734e18f8584cad89", "puttzoo", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "590e6546aacd0d374b7f3a4f53013ab1", "freddicove", Common::EN_USA, Common::kPlatformUnknown },
@@ -189,11 +194,13 @@
 	{ "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::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::kPlatformUnknown },
 	{ "6886e5d08cee329b1f2e743ae2e3ceed", "monkey2", Common::DE_DEU, Common::kPlatformPC },
 	{ "695fe0b3963333b7e15b37514db3c745", "thinkerk", Common::EN_USA, Common::kPlatformUnknown },
 	{ "697c9b7c55a05d8199c48b48e379d2c8", "puttmoon", Common::HB_ISR, Common::kPlatformPC },
@@ -212,12 +219,13 @@
 	{ "6ea966b4d660c870b9ee790d1fbfc535", "monkey2", Common::ES_ESP, Common::kPlatformAmiga },
 	{ "6f0be328c64d689bb606d22a389e1b0f", "loom", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "6f6ef668c608c7f534fea6e6d3878dde", "indy3", Common::DE_DEU, Common::kPlatformPC },
-	{ "701246819d1a70573f41bf33fc19214f", "soccer", Common::EN_USA, Common::kPlatformWindows },
+	{ "701246819d1a70573f41bf33fc19214f", "soccer", Common::EN_USA, Common::kPlatformUnknown },
 	{ "7020931d5a2be0a49d68e7a1882363e4", "zak", Common::EN_USA, Common::kPlatformPC },
 	{ "71523b539491527d9860f4407faf0411", "monkey", Common::EN_USA, Common::kPlatformPC },
 	{ "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::kPlatformUnknown },
 	{ "73e5ab7dbb9a8061cc6d25df02dbd1e7", "loom", Common::EN_USA, Common::kPlatformPC },
 	{ "746e88c172a5b7a1ae89ac0ee3ee681a", "freddi", Common::RU_RUS, Common::kPlatformWindows },
 	{ "754feb59d3bf86b8a00840df74fd7b26", "freddi3", Common::NL_NLD, Common::kPlatformWindows },
@@ -231,18 +239,19 @@
 	{ "7bad72e332a59f9fcc1d437f4edad32a", "puttcircus", Common::RU_RUS, Common::kPlatformUnknown },
 	{ "7c2e76087027eeee9c8f8985f93a1cc5", "freddi4", Common::EN_USA, Common::kPlatformUnknown },
 	{ "7c8100e360e8ef05f88069d4cfa0afd1", "puttrace", Common::EN_USA, Common::kPlatformWindows },
+	{ "7c980a1b1596a93f26917318884f48f7", "PuttTime", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "7ddeaf52c8b9a50551ce0aa2ac811d07", "BluesABCTimeDemo", Common::EN_USA, Common::kPlatformUnknown },
 	{ "7e151c17adf624f1966c8fc5827c95e9", "puttputt", Common::EN_USA, Common::kPlatformUnknown },
 	{ "7ea2da67ebabea4ac20cee9f4f9d2934", "airport", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "7edd665bbede7ea8b7233f8e650be6f8", "samnmax", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "7f45ddd6dbfbf8f80c0c0efea4c295bc", "maniac", Common::EN_USA, Common::kPlatformPC },
 	{ "7f945525abcd48015adf1632637a44a1", "pajama", Common::FR_FRA, Common::kPlatformUnknown },
-	{ "7fc6cdb46b4c9d384c52327f4bca6416", "football", Common::EN_USA, Common::kPlatformWindows },
+	{ "7fc6cdb46b4c9d384c52327f4bca6416", "football", Common::EN_USA, Common::kPlatformUnknown },
 	{ "810a9da887aefa597b0cf3c77d262897", "BluesABCTimeDemo", Common::EN_USA, Common::kPlatformWindows },
 	{ "81bbfa181184cb494e7a81dcfa94fbd9", "maniac", Common::FR_FRA, Common::kPlatformNES },
 	{ "8299d9b8a1b0e7b881bae7a9971dc5e2", "zak", Common::EN_USA, Common::kPlatformAtariST },
 	{ "8368f552b1e3eba559f8d559bcc4cadb", "freddi3", Common::UNK_LANG, Common::kPlatformUnknown },
-	{ "83cedbe26aa8b58988e984e3d34cac8e", "freddi3", Common::DE_DEU, Common::kPlatformWindows },
+	{ "83cedbe26aa8b58988e984e3d34cac8e", "freddi3", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "84e3c23a49ded8a6f9197735c8eb3de7", "PuttTime", Common::DE_DEU, Common::kPlatformWindows },
 	{ "861e59ed72a1cd0e6d454f7ee7e2bf3d", "comi", Common::RU_RUS, Common::kPlatformUnknown },
 	{ "86be8ada36371d4fdc35659d0e912a26", "indy3", Common::ES_ESP, Common::kPlatformPC },
@@ -252,6 +261,7 @@
 	{ "8801fb4a1200b347f7a38523339526dd", "jungle", Common::EN_USA, Common::kPlatformWindows },
 	{ "883af4b0af4f77a92f1dcf1d0a283140", "tentacle", Common::ES_ESP, Common::kPlatformUnknown },
 	{ "898ce8eb1234a955ef75e87141902bb3", "freddi3", Common::RU_RUS, Common::kPlatformWindows },
+	{ "898eaa21f79cf8d4f08db856244689ff", "pajama", Common::EN_USA, Common::kPlatformWindows },
 	{ "8a484262363a8e18be87112454f1456b", "pjgames", Common::EN_USA, Common::kPlatformUnknown },
 	{ "8aa05d3cdb0e795436043f0546af2da2", "tentacle", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "8afb3cf9f95abf208358e984f0c9e738", "funpack", Common::EN_USA, Common::kPlatformUnknown },
@@ -293,7 +303,7 @@
 	{ "9e5e0fb43bd22f4628719b7501adb717", "monkey", Common::FR_FRA, Common::kPlatformAtariST },
 	{ "a0a7dea72003933b8b3f8b99b9f7ddeb", "loom", Common::EN_USA, Common::kPlatformAtariST },
 	{ "a194f15f51ee62badab74b9e7da97693", "baseball2001", Common::EN_USA, Common::kPlatformUnknown },
-	{ "a28135a7ade38cc0208b04507c46efd1", "spyfox", Common::DE_DEU, Common::kPlatformWindows },
+	{ "a28135a7ade38cc0208b04507c46efd1", "spyfox", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "a2bb6aa0537402c1b3c2ea899ccef64b", "lost", Common::EN_USA, Common::kPlatformWindows },
 	{ "a3036878840720fbefa41e6965fa4a0a", "samnmax", Common::EN_USA, Common::kPlatformPC },
 	{ "a525c1753c1db5011c00417da37887ef", "PuttTime", Common::EN_USA, Common::kPlatformUnknown },
@@ -324,6 +334,7 @@
 	{ "b8955d7d23b4972229060d1592489fef", "freddicove", Common::NL_NLD, Common::kPlatformWindows },
 	{ "ba888e6831517597859e91aa173f945c", "spyfox", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "bbadf7309c4a2c2763e4bbba3c3be634", "freddi3", Common::FR_FRA, Common::kPlatformUnknown },
+	{ "bc4700bc0e12879f6d25d14d6be6cfdd", "spyfox2", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "bd126753de619a495f9f22adc951c8d5", "monkey2", Common::IT_ITA, Common::kPlatformPC },
 	{ "be39a5d4db60e8aa736b9086778cb45c", "spyozon", Common::EN_USA, Common::kPlatformWindows },
 	{ "be83e882b44f2767bc08d4f766ebc347", "maniac", Common::DE_DEU, Common::kPlatformAtariST },
@@ -343,7 +354,7 @@
 	{ "c5d10e190d4b4d59114b824f2fdbd00e", "loom", Common::EN_USA, Common::kPlatformFMTowns },
 	{ "c63ee46143ba65f9ce14cf539ca51bd7", "atlantis", Common::EN_USA, Common::kPlatformPC },
 	{ "c666a998af90d81db447eccba9f72c8d", "monkey", Common::EN_USA, Common::kPlatformAtariST },
-	{ "c6907d44f1166941d982864cd42cdc89", "pajama2", Common::DE_DEU, Common::kPlatformWindows },
+	{ "c6907d44f1166941d982864cd42cdc89", "pajama2", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "c7890e038806df2bb5c0c8c6f1986ea2", "monkey", Common::EN_USA, Common::kPlatformPC },
 	{ "c7be10f775404fd9785a8b92a06d240c", "atlantis", Common::EN_USA, Common::kPlatformFMTowns },
 	{ "c83079157ec765a28de445aec9768d60", "tentacle", Common::EN_USA, Common::kPlatformUnknown },
@@ -358,11 +369,13 @@
 	{ "ce7733f185b838e248927c7ba1a04204", "maniac", Common::FR_FRA, Common::kPlatformAmiga },
 	{ "ce7fd0c382389a6791fc3e199c117ef4", "indy3", Common::ES_ESP, Common::kPlatformPC },
 	{ "cea91e3dd47f2518ea418e41611aa77f", "spyfox2", Common::RU_RUS, Common::kPlatformUnknown },
-	{ "cf8d13446ec6cb6222287a925fd47c1d", "baseball", Common::EN_USA, Common::kPlatformWindows },
+	{ "cf4ef315214c7d8cdab6302cdb7e50db", "freddi", Common::DE_DEU, Common::kPlatformWindows },
+	{ "cf8d13446ec6cb6222287a925fd47c1d", "baseball", Common::EN_USA, Common::kPlatformUnknown },
 	{ "cf8ef3a1fb483c5c4b1c584d1167b2c4", "freddi", Common::DE_DEU, Common::kPlatformWindows },
 	{ "cf90b4db5486ef798db78fe6fbf897e5", "pajama3", Common::EN_USA, Common::kPlatformWindows },
 	{ "d06fbe28818fef7bfc45c2cdf0c0849d", "zak", Common::DE_DEU, Common::kPlatformPC },
 	{ "d0b531227a27c6662018d2bd05aac52a", "monkey", Common::DE_DEU, Common::kPlatformPC },
+	{ "d220d154aafbfa12bd6f3ab1b2dae420", "puttzoo", Common::DE_DEU, Common::kPlatformMacintosh },
 	{ "d37c55388294b66e53e7ced3af88fa68", "freddi2", Common::EN_USA, Common::kPlatformUnknown },
 	{ "d43352a805d78b5f4936c6d7779bf575", "samnmax", Common::RU_RUS, Common::kPlatformPC },
 	{ "d4aac997e2f4e15341f0bfbf905419bd", "PuttTime", Common::EN_USA, Common::kPlatformWindows },
@@ -415,11 +428,13 @@
 	{ "f049e38c1f8302b5db6170f1872af89a", "monkey", Common::ES_ESP, Common::kPlatformPC },
 	{ "f06e66fd45b2f8b0f4a2833ff4476050", "fbpack", Common::HB_ISR, Common::kPlatformPC },
 	{ "f08145577e4f13584cc90b3d6e9caa55", "pajama3", Common::NL_NLD, Common::kPlatformUnknown },
+	{ "f1b0e0d587b85052de5534a3847e68fe", "water", Common::EN_USA, Common::kPlatformUnknown },
 	{ "f237bf8a5ef9af78b2a6a4f3901da341", "pajama", Common::EN_USA, Common::kPlatformUnknown },
 	{ "f27b1ba0eadaf2a6617b2b58192d1dbf", "samnmax", Common::DE_DEU, Common::kPlatformPC },
 	{ "f3d55aea441e260e9e9c7d2a187097e0", "puttzoo", Common::EN_USA, Common::kPlatformWindows },
 	{ "f40a7f495f59188ca57a9d1d50301bb6", "puttputt", Common::EN_USA, Common::kPlatformMacintosh },
-	{ "f7711f9264d4d43c2a1518ec7c10a607", "pajama3", Common::EN_USA, Common::kPlatformWindows },
+	{ "f73883f13b5a302749a5bad31d909780", "tentacle", Common::DE_DEU, Common::kPlatformMacintosh },
+	{ "f7711f9264d4d43c2a1518ec7c10a607", "pajama3", Common::EN_USA, Common::kPlatformUnknown },
 	{ "f79e60c17cca601e411f1f75e8ee9b5a", "spyfox2", Common::EN_USA, Common::kPlatformUnknown },
 	{ "fa127d7c4bb47d05bb1c33ddcaa9f767", "loom", Common::DE_DEU, Common::kPlatformPC },
 	{ "fb66aa42de21675116346213f176a366", "monkey", Common::IT_ITA, Common::kPlatformAmiga },
@@ -429,7 +444,7 @@
 	{ "fc6b6148e80d67939d9a18697c0f626a", "monkey", Common::DE_DEU, Common::kPlatformPC },
 	{ "fc8d197a22146e74766e9cb0cfcaf1da", "freddi2", Common::EN_USA, Common::kPlatformUnknown },
 	{ "fcb78ebecab2757264c590890c319cc5", "PuttTime", Common::NL_NLD, Common::kPlatformWindows },
-	{ "fce4b8010704b103acfeea9413788f32", "freddi2", Common::DE_DEU, Common::kPlatformWindows },
+	{ "fce4b8010704b103acfeea9413788f32", "freddi2", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "fe381e45117878b1e942cb876b050fd6", "ft", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "fe60d6b5ff51b0553ac59963123b5777", "comi", Common::UNK_LANG, Common::kPlatformUnknown },
 	{ "ff05c07990061d97647f059c48c1d05a", "zak", Common::DE_DEU, Common::kPlatformAtariST },

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.21
retrieving revision 1.603.2.22
diff -u -d -r1.603.2.21 -r1.603.2.22
--- scumm.cpp	18 Nov 2005 23:49:07 -0000	1.603.2.21
+++ scumm.cpp	21 Dec 2005 11:37:28 -0000	1.603.2.22
@@ -265,7 +265,7 @@
 	 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
@@ -394,6 +394,8 @@
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"566165a7338fa11029e7c14d94fa70d0", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 73, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"cf4ef315214c7d8cdab6302cdb7e50db", "Freddi Fish 1: The Case of the Missing Kelp Seeds (German Demo)", GID_HEGAME, 6, 73, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"c8aac5e3e701874e2fa4117896f9e1b1", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Macintosh Demo)", GID_HEGAME, 6, 73, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
@@ -425,6 +427,8 @@
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"e03ed1474ec14de78359970e0457a820", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Updated Demo)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"688328c5bdc4c8ec4145688dfa077bf2", "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (German Demo)", GID_HEGAME, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // Ff4demo
 
 	{"b8955d7d23b4972229060d1592489fef", "Freddi Fish 5: The Case of the Creature of Coral Cave (Updated Dutch)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows}, // FreddiDZZ
@@ -440,6 +444,9 @@
 	{"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_WATER, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+
 	{"9d7b67be003fea60be4dcbd193611936", "Full Throttle (Mac Demo)", GID_FT, 7, 0, MDT_NONE,
 	 GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEMO, Common::kPlatformMacintosh},
 	{"32a433dea56b86a55b59e4ff7d755711", "Full Throttle (PC Demo)", GID_FT, 7, 0, MDT_NONE,
@@ -506,6 +513,8 @@
 	{"ef71a322b6530ac45b1a070f7c0795f7", "Moonbase Commander (Demo)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 
+	{"898eaa21f79cf8d4f08db856244689ff", "Pajama Sam: No Need To Hide When It's Dark Outside (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"37aed3f91c1ef959e0bd265f9b13781f", "Pajama Sam: No Need To Hide When It's Dark Outside (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // PajamaNHD
 	{"d7ab7cd6105546016e6a0d46fb36b964", "Pajama Sam: No Need To Hide When It's Dark Outside (Updated Demo)", GID_HEGAME, 6, 100, MDT_NONE,
@@ -523,10 +532,14 @@
 	{"a561d2e2413cc1c71d5a1bf87bf493ea", "Pajama Sam's Lost & Found (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
 
+	{"055ffe4f47753e47594ac67823220c54", "Putt-Putt Enters the Race (German)", GID_PUTTRACE, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows}, // ToffRennen
 	{"6af2419fe3db5c2fdb091ae4e5833770", "Putt-Putt Enters the Race (Dutch Demo)", GID_PUTTRACE, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows}, // 500demo
 	{"aaa587701cde7e74692c68c1024b85eb", "Putt-Putt Enters the Race (Updated Dutch Demo)", GID_PUTTRACE, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows},
+	{"663743c03ae0c007f3d665cf631c0e6b", "Putt-Putt Enters the Race (German Demo)", GID_PUTTRACE, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows}, // Rennen
 	{"7c8100e360e8ef05f88069d4cfa0afd1", "Putt-Putt Enters the Race (UK Demo)", GID_PUTTRACE, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows},
 
@@ -553,6 +566,8 @@
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"d4aac997e2f4e15341f0bfbf905419bd", "Putt-Putt Travels Through Time (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"7c980a1b1596a93f26917318884f48f7", "Putt-Putt Travels Through Time (Updated German)", GID_HEGAME, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"defb8cb9ec4b0f91acfb6b61c6129ad9", "Putt-Putt Travels Through Time (Updated Russian)", GID_HEGAME, 6, 99, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"a525c1753c1db5011c00417da37887ef", "Putt-Putt Travels Through Time (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
@@ -631,6 +646,8 @@
 
 	{"3de99ef0523f8ca7958faa3afccd035a", "Spyfox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
+	{"58436e634f4fae1d9973591c2ffa1fcb", "Spyfox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 99, MDT_NONE,
+	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"9bda5fee51d2fda5253d02c642016bf4", "Spyfox 1: Dry Cereal (Updated Dutch)", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows},
 	{"a28135a7ade38cc0208b04507c46efd1", "Spyfox 1: Dry Cereal (Updated German)", GID_HEGAME, 6, 99, MDT_NONE,
@@ -708,7 +725,7 @@
 	{ "samnmax", "samdemo", kGenPC },
 	{ "samnmax", "snmdemo", kGenPC },
 	{ "samnmax", "snmidemo", kGenPC },
-	{ "snmdemo", "sdemo", kGenPC },
+	{ "samnmax", "sdemo", kGenPC },
 #ifndef DISABLE_SCUMM_7_8
 	{ "dig.la0", "The Dig Data", kGenAsIs },
 	{ "dig.la0", "The Dig Demo Data", kGenAsIs },
@@ -716,8 +733,6 @@
 	{ "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 },
 #endif
 #ifndef DISABLE_HE
@@ -754,6 +769,7 @@
 	{ "freddi2", "Freddi Fish 2 Demo", kGenMac },
 	{ "freddi2", "Freddi Fish 2", kGenMac },
 	{ "freddi2", "FreddiCHSH", kGenPC },
+	{ "freddi2", "Fritzi Fisch 2", kGenMac },
 	{ "freddi3", "Freddi Fish 3", kGenMac },
 	{ "freddi3", "FreddiSCS", kGenPC },
 	{ "freddi3", "F3-mdemo", kGenMac },
@@ -761,12 +777,13 @@
 	{ "freddi3", "f3-mdemo", kGenPC },
 	{ "freddi3", "FF3-DEMO", kGenPC },
 	{ "freddi3", "FreddiFGT", kGenPC },
+	{ "freddi3", "FreddiFGT", kGenMac },
 	{ "freddi3", "MM3-DEMO", kGenPC },
 	{ "freddi3", "MM3-Demo", kGenMac }, // FR Mac demo
 	{ "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 },
@@ -790,17 +807,22 @@
 	{ "pajama2", "Pajama Sam 2", kGenMac },
 	{ "pajama2", "PajamaTAL", kGenPC },
 	{ "pajama2", "PyjamaDBMN", kGenPC },
+	{ "pajama2", "PyjamaDBMN", kGenMac },
 	{ "pajama2", "PJ2Demo", kGenMac },
 	{ "pajama2", "pj2demo", kGenPC },
 	{ "pajama2", "Pjs2demo", kGenPC },
 	{ "pajama2", "PJ2 Demo", kGenMac }, // NL Mac demo
+	{ "pajama3", "GPJ3Demo", kGenPC },
+	{ "pajama3", "Pajama Sam 3", kGenMac },
 	{ "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 },
+	{ "pajama3", "PyjamaSKS", kGenPC },
+	{ "pajama3", "PyjamaSKS", kGenMac },
 	{ "pjgames", "PJGames", kGenMac },
 	{ "puttcircus", "circdemo", kGenPC },
 	{ "puttcircus", "Putt Circus Demo", kGenMac },
@@ -814,9 +836,11 @@
 	{ "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 },
+	{ "puttrace", "ToffRennen", kGenPC },
+	{ "puttrace", "ToffRennen", kGenMac },
 	{ "PuttsFunShop", "Putt's FunShop", kGenMac },
 	{ "putttime", "PuttPuttTTT", kGenPC },
 	{ "putttime", "PuttPuttTTT", kGenMac },
@@ -830,6 +854,7 @@
 	{ "putttime", "TEMPDEMO", kGenPC },
 	{ "putttime", "Tempdemo", kGenMac }, // FR Mac demo
 	{ "putttime", "toffzeit", kGenPC }, // German T’¨¢öff-T’¨¢öff: Reist durch die Zeit
+	{ "putttime", "toffzeit", kGenMac }, // German T’¨¢öff-T’¨¢öff: Reist durch die Zeit
 	{ "puttzoo", "Puttzoo Demo", kGenMac },
 	{ "puttzoo", "PuttZoo", kGenMac },
 	{ "puttzoo", "zoodemo", kGenPC },
@@ -845,12 +870,18 @@
 	{ "spyfox", "Spydemo", kGenPC},
 	{ "spyfox", "SPYFox", kGenMac },
 	{ "spyfox", "SPYFoxDC", kGenPC },
+	{ "spyfox", "SPYFoxDC", kGenMac },
+	{ "spyfox", "SpyFoxDMK", kGenPC },
+	{ "spyfox", "SpyFoxDMK", kGenMac },
 	{ "spyfox", "Spy Fox Demo", kGenMac }, // NL Mac demo
 	{ "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", "SpyFoxOR", kGenPC },
+	{ "spyfox2", "SpyFoxOR", kGenMac },
 	{ "spyfox2", "spyfoxsr", kGenPC },
 	{ "spyozon", "sf3-demo", kGenPC },
 	{ "spyozon", "Spy Ozone Demo", kGenMac },
@@ -859,7 +890,6 @@
 	{ "thinker1", "1grademo", kGenPC },
 	{ "thinker1", "Thinker1", kGenMac },
 	{ "thinkerk", "kinddemo", kGenPC },
-	{ "thinkerk", "Kinddemo", kGenMac },
 	{ "thinkerk", "KindDemo", kGenMac },
 	{ "thinkerk", "ThinkerK", kGenMac },
 	{ "water", "Water Worries", kGenMac },

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.647.2.7
retrieving revision 1.647.2.8
diff -u -d -r1.647.2.7 -r1.647.2.8
--- scumm.h	8 Nov 2005 00:49:33 -0000	1.647.2.7
+++ scumm.h	21 Dec 2005 11:37:28 -0000	1.647.2.8
@@ -231,10 +231,11 @@
 	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

More information about the Scummvm-git-logs mailing list