Add French and Dutch Mac HE demos. Noticed and described same bug in some

of them which seems to be a regression.

svn-id: r19284

3 files changed, 21 insertions, 13 deletions

diff --git a/scumm/scumm-md5.h b/scumm/scumm-md5.h
index c9a0d0bf5f..e5bfc20130 100644
--- a/scumm/scumm-md5.h
+++ b/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Tue Oct 25 09:59:10 2005
+  This file was generated by the md5table tool on Tue Oct 25 22:41:42 2005
   DO NOT EDIT MANUALLY!
  */
 
@@ -93,7 +93,7 @@ static const MD5Table md5table[] = {
 	{ "2e85f7aa054930c692a5b1bed1dfc295", "football", Common::EN_USA, Common::kPlatformUnknown },
 	{ "2fe369ad70f52a8cf7ad6077ee64f81a", "loom", Common::DE_DEU, Common::kPlatformAmiga },
 	{ "305d3dd57c96c65b017bc70c8c7cfb5e", "monkey", Common::DE_DEU, Common::kPlatformPC },
-	{ "30ba1e825d4ad2b448143ae8df18482a", "pajama2", Common::NL_NLD, Common::kPlatformWindows },
+	{ "30ba1e825d4ad2b448143ae8df18482a", "pajama2", Common::NL_NLD, Common::kPlatformUnknown },
 	{ "319a4dde52c7960b5aae8a1ec348d918", "monkey", Common::DE_DEU, Common::kPlatformAmiga },
 	{ "31aa57f460a3d12429f0552a46a90b39", "puttputt", Common::EN_USA, Common::kPlatformPC },
 	{ "31b8fda4c8c7413fa6b39997e776eba4", "loom", Common::JA_JPN, Common::kPlatformFMTowns },
@@ -167,7 +167,7 @@ static const MD5Table md5table[] = {
 	{ "589601b676c98b1c0c987bc031ab68b3", "chase", Common::EN_USA, Common::kPlatformUnknown },
 	{ "58fdf4c7ad13540a734e18f8584cad89", "puttzoo", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "590e6546aacd0d374b7f3a4f53013ab1", "freddicove", Common::EN_USA, Common::kPlatformUnknown },
-	{ "59d5cfcc5e672a6e07baae01328b918b", "PuttTime", Common::FR_FRA, Common::kPlatformWindows },
+	{ "59d5cfcc5e672a6e07baae01328b918b", "PuttTime", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "5a35e36fd777e9c37a49c5b2faca52f9", "loom", Common::EN_USA, Common::kPlatformPC },
 	{ "5b08000a9c47b2887df6506ac767ca68", "fbear", Common::EN_USA, Common::kPlatformUnknown },
 	{ "5bd335265a61caa3d78956ad9f88ba23", "football", Common::EN_USA, Common::kPlatformUnknown },
@@ -195,7 +195,7 @@ static const MD5Table md5table[] = {
 	{ "6a30a07f353a75cdc602db27d73e1b42", "puttputt", Common::EN_USA, Common::kPlatformWindows },
 	{ "6af2419fe3db5c2fdb091ae4e5833770", "puttrace", Common::NL_NLD, Common::kPlatformUnknown },
 	{ "6b19d0e25cbf720d05822379b8b90ed9", "PuttTime", Common::NL_NLD, Common::kPlatformWindows },
-	{ "6b257bb2827dd894b8109a50a1a18b5a", "freddicove", Common::NL_NLD, Common::kPlatformWindows },
+	{ "6b257bb2827dd894b8109a50a1a18b5a", "freddicove", Common::NL_NLD, Common::kPlatformUnknown },
 	{ "6b3ec67da214f558dc5ceaa2acd47453", "indy3", Common::EN_USA, Common::kPlatformPC },
 	{ "6b5a3fef241e90d4b2e77f1e222773ee", "maniac", Common::SE_SWE, Common::kPlatformNES },
 	{ "6bf70eee5de3d24d2403e0dd3d267e8a", "spyfox", Common::EN_USA, Common::kPlatformWindows },
@@ -230,7 +230,7 @@ static const MD5Table md5table[] = {
 	{ "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::kPlatformWindows },
+	{ "7f945525abcd48015adf1632637a44a1", "pajama", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "7fc6cdb46b4c9d384c52327f4bca6416", "football", Common::EN_USA, Common::kPlatformWindows },
 	{ "810a9da887aefa597b0cf3c77d262897", "BluesABCTimeDemo", Common::EN_USA, Common::kPlatformWindows },
 	{ "81bbfa181184cb494e7a81dcfa94fbd9", "maniac", Common::FR_FRA, Common::kPlatformNES },
@@ -312,8 +312,8 @@ static const MD5Table md5table[] = {
 	{ "b628506f7def772e40de0aa5440fb8e1", "activity", Common::EN_USA, Common::kPlatformWindows },
 	{ "b886b0a5d909c7158a914e1d7c1c6c65", "loom", Common::FR_FRA, Common::kPlatformPC },
 	{ "b8955d7d23b4972229060d1592489fef", "freddicove", Common::NL_NLD, Common::kPlatformWindows },
-	{ "ba888e6831517597859e91aa173f945c", "spyfox", Common::FR_FRA, Common::kPlatformWindows },
-	{ "bbadf7309c4a2c2763e4bbba3c3be634", "freddi3", Common::FR_FRA, Common::kPlatformWindows },
+	{ "ba888e6831517597859e91aa173f945c", "spyfox", Common::FR_FRA, Common::kPlatformUnknown },
+	{ "bbadf7309c4a2c2763e4bbba3c3be634", "freddi3", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "bd126753de619a495f9f22adc951c8d5", "monkey2", Common::IT_ITA, Common::kPlatformPC },
 	{ "be39a5d4db60e8aa736b9086778cb45c", "spyozon", Common::EN_USA, Common::kPlatformWindows },
 	{ "be83e882b44f2767bc08d4f766ebc347", "maniac", Common::DE_DEU, Common::kPlatformAtariST },
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index fb90ef3c7c..1ce51449b2 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -748,6 +748,7 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "freddi3", "f3-mdemo", kGenPC },
 	{ "freddi3", "FF3-DEMO", kGenPC },
 	{ "freddi3", "MM3-DEMO", kGenPC },
+	{ "freddi3", "MM3-Demo", kGenMac }, // FR Mac demo
 	{ "freddi4", "f4-demo", kGenPC },
 	{ "freddi4", "ff4demo", kGenPC },
 	{ "freddi4", "Freddi 4 Demo", kGenMac },
@@ -760,6 +761,7 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "freddicove", "ff5demo", kGenPC },
 	{ "freddicove", "FFCoveDemo", kGenPC },
 	{ "freddicove", "FreddiCoveDemo", kGenMac },
+	{ "freddicove", "FF5Demo", kGenMac }, // NL Mac demo
 	{ "FreddisFunShop", "Freddi's FunShop", kGenMac },
 	{ "lost", "Lost and Found", kGenMac },
 	{ "lost", "smaller", kGenPC },
@@ -768,12 +770,14 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "pajama", "Pajama Sam", kGenMac },
 	{ "pajama", "PajamaNHD", kGenPC },
 	{ "pajama", "SAMDEMO", kGenPC },
+	{ "pajama", "SAMDEMO", kGenMac }, // FR Mac demo
 	{ "pajama2", "Pajama Sam 2", kGenMac },
 	{ "pajama2", "PajamaTAL", kGenPC },
 	{ "pajama2", "PyjamaDBMN", kGenPC },
 	{ "pajama2", "PJ2Demo", kGenMac },
 	{ "pajama2", "pj2demo", kGenPC },
 	{ "pajama2", "Pjs2demo", kGenPC },
+	{ "pajama2", "PJ2 Demo", kGenMac }, // NL Mac demo
 	{ "pajama3", "Pajama Sam 3-Demo", kGenMac },
 	{ "pajama3", "pj3-demo", kGenPC },
 	{ "pajama3", "pj3demo", kGenPC },
@@ -796,6 +800,7 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "puttrace", "racedemo", kGenPC },
 	{ "puttrace", "RaceDemo", kGenMac },
 	{ "puttrace", "racedemo", kGenMac },
+	{ "puttrace", "Putt500 demo", kGenMac }, // NL Mac demo
 	{ "puttrace", "Putt Race", kGenMac },
 	{ "PuttsFunShop", "Putt's FunShop", kGenMac },
 	{ "putttime", "PuttPuttTTT", kGenPC },
@@ -808,6 +813,7 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "putttime", "timedemo", kGenPC },
 	{ "putttime", "TimeDemo", kGenMac },
 	{ "putttime", "TEMPDEMO", kGenPC },
+	{ "putttime", "Tempdemo", kGenMac }, // FR Mac demo
 	{ "puttzoo", "Puttzoo Demo", kGenMac },
 	{ "puttzoo", "PuttZoo", kGenMac },
 	{ "puttzoo", "zoodemo", kGenPC },
@@ -821,6 +827,8 @@ static SubstResFileNames substResFileNameTable[] = {
 	{ "spyfox", "Spydemo", kGenPC},
 	{ "spyfox", "SPYFox", kGenMac },
 	{ "spyfox", "SPYFoxDC", kGenPC },
+	{ "spyfox", "Spy Fox Demo", kGenMac }, // NL Mac demo
+	{ "spyfox", "JR-Demo", kGenMac }, // FR Mac demo
 	{ "spyfox2", "sf2-demo", kGenPC },
 	{ "spyfox2", "sf2demo", kGenPC },
 	{ "spyfox2", "Spy Fox 2 - Demo", kGenMac },
diff --git a/tools/scumm-md5.txt b/tools/scumm-md5.txt
index 72af957ae3..d5816b9b64 100644
--- a/tools/scumm-md5.txt
+++ b/tools/scumm-md5.txt
@@ -340,7 +340,7 @@ Freddi Fish 3: The Case of the Stolen Conch Shell
 	-	Windows	ru	898ce8eb1234a955ef75e87141902bb3	freddi3	sev
 	-	Windows	ru	75bff95816b84672b877d22a911ab811	freddi3	sev
 	Demo	All	en	cb1559e8405d17a5a278a6b5ad9338d1	freddi3	khalek, sev
-	Demo	Windows	fr	bbadf7309c4a2c2763e4bbba3c3be634	freddi3	Kirben
+	Demo	All	fr	bbadf7309c4a2c2763e4bbba3c3be634	freddi3	Kirben
 	Demo	Windows	nl	754feb59d3bf86b8a00840df74fd7b26	freddi3	adutchguy
 
 Freddie Fish 4: The Case of the Hogfish Rustlers of Briny Gulch
@@ -361,7 +361,7 @@ Freddi Fish 5: The Case of the Creature of Coral Cave
 	-	Windows	ru	21abe302e1b1e2b66d6f5c12e241ebfd	freddicove	sev
 	-	Windows	ru	4ce2d5b355964bbcb5e5ce73236ef868	freddicove	sev
 	Demo	All	en	45082a5c9f42ba14dacfe1fdeeba819d	freddicove	sev
-	Demo	Windows	nl	6b257bb2827dd894b8109a50a1a18b5a	freddicove	Kirben
+	Demo	All	nl	6b257bb2827dd894b8109a50a1a18b5a	freddicove	Kirben, sev
 
 Freddi Fish and Luther's Water Worries
 	-	All	en	4ba37f835be11a59d969f90f272f575b	water	Kirben
@@ -405,7 +405,7 @@ Pajama Sam 1: No Need to Hide When It's Dark Outside
 	-	Windows	nl	4fa6870d9bc8c313b65d54b1da5a1891	pajama	joostp
 	Demo	All	en	f237bf8a5ef9af78b2a6a4f3901da341	pajama	khalek, sev
 	Demo	All	en	d7ab7cd6105546016e6a0d46fb36b964	pajama	khalek
-	Demo	Windows	fr	7f945525abcd48015adf1632637a44a1	pajama	Kirben
+	Demo	All	fr	7f945525abcd48015adf1632637a44a1	pajama	Kirben
 	Demo	Windows	nl	0305e850382b812fec6e5998ef88a966	pajama	adutchguy
 
 Pajama Sam 2: Thunder and Lightning Aren't so Frightening
@@ -413,7 +413,7 @@ Pajama Sam 2: Thunder and Lightning Aren't so Frightening
 	-	Windows	de	c6907d44f1166941d982864cd42cdc89	pajama2	nachbarnebenan
 	-	Windows	ru	32709cbeeb3044b34129950860a83f14	pajama2	sev
 	Demo	All	en	36a6750e03fb505fc19fc2bf3e4dbe91	pajama2	sev
-	Demo	Windows	nl	30ba1e825d4ad2b448143ae8df18482a	pajama2	Kirben
+	Demo	All	nl	30ba1e825d4ad2b448143ae8df18482a	pajama2	Kirben
 
 Pajama Sam 3: You Are What You Eat From Your Head to Your Feet
 	-	Windows	en	f7711f9264d4d43c2a1518ec7c10a607	pajama3	Kirben
@@ -485,7 +485,7 @@ Putt-Putt Travels Through Time
 	-	Windows	ru	defb8cb9ec4b0f91acfb6b61c6129ad9	PuttTime	sev
 	Demo	All	en	4e5867848ee61bc30d157e2c94eee9b4	PuttTime	khalek, sev
 	Demo	All	en	0ab19be9e2a3f6938226638b2a3744fe	PuttTime	khalek
-	Demo	Windows	fr	59d5cfcc5e672a6e07baae01328b918b	PuttTime	Kirben
+	Demo	All	fr	59d5cfcc5e672a6e07baae01328b918b	PuttTime	Kirben
 	Demo	Windows	nl	6b19d0e25cbf720d05822379b8b90ed9	PuttTime	adutchguy
 
 Putt-Putt and Pep's Balloon-O-Rama
@@ -517,7 +517,7 @@ Spy Fox 1: Dry Cereal
 	Demo	All	en	53e94115b55dd51d4b8ff0871aa1df1e	spyfox	khalek, sev
 	Demo	All	en	fbdd947d21e8f5bac6d6f7a316af1c5a	spyfox	sev
 	Demo	Windows	en	9d4ab3e0e1d1ebc6ba8a6a4c470ed184	spyfox	khalek
-	Demo	Windows	fr	ba888e6831517597859e91aa173f945c	spyfox	Kirben
+	Demo	All	fr	ba888e6831517597859e91aa173f945c	spyfox	Kirben
 	Demo	Windows	nl	4edbf9d03550f7ba01e7f34d69b678dd	spyfox	Kirben
 
 Spy Fox 2: Some Assembly Required