Added variant string for some HE games

svn-id: r21574

2 files changed, 19 insertions, 20 deletions

diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index 5664f05218..027fc746b1 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -480,19 +480,17 @@ static const ScummGameSettings extra_versions[] = {
 	{"puttputt", "Demo",  GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
 
 
-	{"freddi4", "Unencrypted Russian", GID_HEGAME, 6, 98, MDT_NONE, GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows},
+	// The folloowing is used for the unencrypted russian version.
+	// TODO: Get rid of GF_USE_KEY and detect XOR encryption on the fly.
+	{"freddi4", "unenc", GID_HEGAME, 6, 98, MDT_NONE, GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows},
 
+	// The folloowing is used for the unencrypted russian version.
+	// TODO: Get rid of GF_USE_KEY and detect XOR encryption on the fly.
+	{"freddicove", "unenc",  GID_HEGAME, 6,  99, MDT_NONE,              GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
+	{"freddicove", "HE 100", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
 
-	{"freddicove", "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
-	{"freddicove", "Updated Russian",     GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"freddicove", "Unencrypted Russian", GID_HEGAME, 6,  99, MDT_NONE,              GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"freddicove", "Updated Demo",        GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows},
-	{"freddicove", "Updated Dutch Demo",  GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows}, // FF5Demo
-
-
-	{"lost", "Test",    GID_HEGAME, 6,  99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
-	{"lost", "Updated", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
-
+	{"lost", "HE 99",  GID_HEGAME, 6,  99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
+	{"lost", "HE 100", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows},
 
 	// The following are meant to be generic HE game variants and as such do
 	// not specify a game ID. Make sure that these are last in the table, else
@@ -1680,7 +1678,8 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
 	elem = (const MD5Table *)bsearch(md5, md5table, arraySize, sizeof(MD5Table), compareMD5Table);
 	if (!elem)
 		printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", md5);
-
+	else
+		debug(5, "Using MD5 '%s'", md5);
 
 	// Now search our 'database' for the MD5; if a match is found, we use 
 	// the information in the 'database' to correct the GameDescriptor.
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 8564b7ed6a..bc21004df8 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Wed Mar 29 06:23:48 2006
+  This file was generated by the md5table tool on Mon Apr  3 11:01:05 2006
   DO NOT EDIT MANUALLY!
  */
 
@@ -23,7 +23,7 @@ static const MD5Table md5table[] = {
 	{ "055ffe4f47753e47594ac67823220c54", "puttrace", "HE 99", "", Common::DE_DEU, Common::kPlatformUnknown },
 	{ "06b187468113f9ae5a400b148a847fac", "atlantis", "", "Floppy", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "07433205acdca3bc553d0e731588b35f", "airport", "", "", Common::EN_USA, Common::kPlatformWindows },
-	{ "07b810e37be7489263f7bc7627d4765d", "freddi4", "", "", Common::RU_RUS, Common::kPlatformWindows },
+	{ "07b810e37be7489263f7bc7627d4765d", "freddi4", "unenc", "Unencrypted", Common::RU_RUS, Common::kPlatformWindows },
 	{ "084ed0fa98a6d1e9368d67fe9cfbd417", "freddi", "HE 71", "Demo", Common::EN_USA, Common::kPlatformWindows },
 	{ "0855496dde35356b1a9691e22ba84cdc", "freddi", "HE 73", "Demo", Common::EN_USA, Common::kPlatformWindows },
 	{ "08656dd9698ddf1023ba9bf8a195e37b", "monkey", "VGA", "VGA", Common::EN_USA, Common::kPlatformPC },
@@ -82,7 +82,7 @@ static const MD5Table md5table[] = {
 	{ "20da6fce37805423966aaa8f3c2426aa", "atlantis", "", "Floppy", Common::FR_FRA, Common::kPlatformAmiga },
 	{ "2108d83dcf09f8adb4bc524669c8cf51", "PuttTime", "HE 99", "", Common::EN_USA, Common::kPlatformUnknown },
 	{ "21a6592322f92550f144f68a8a4e685e", "dig", "", "", Common::FR_FRA, Common::kPlatformMacintosh },
-	{ "21abe302e1b1e2b66d6f5c12e241ebfd", "freddicove", "", "", Common::RU_RUS, Common::kPlatformWindows },
+	{ "21abe302e1b1e2b66d6f5c12e241ebfd", "freddicove", "unenc", "Unencrypted", Common::RU_RUS, Common::kPlatformWindows },
 	{ "2232b0b9411575b1f9961713ebc9de61", "balloon", "HE 80", "", Common::ES_ESP, Common::kPlatformWindows },
 	{ "225e18566e810c634bf7de63e7568e3e", "mustard", "", "", Common::EN_USA, Common::kPlatformUnknown },
 	{ "22c9eb04455440131ffc157aeb8d40a8", "fbear", "HE 70", "Demo", Common::EN_USA, Common::kPlatformWindows },
@@ -157,7 +157,7 @@ static const MD5Table md5table[] = {
 	{ "4ba7fb331296c283e73d8f5b2096e551", "samnmax", "", "CD", Common::ES_ESP, Common::kPlatformUnknown },
 	{ "4bedb49943df95a9c900a5a82ccbe9de", "ft", "", "", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "4cb9c3618f71668f8e4346c8f323fa82", "monkey2", "", "", Common::EN_USA, Common::kPlatformMacintosh },
-	{ "4ce2d5b355964bbcb5e5ce73236ef868", "freddicove", "", "", Common::RU_RUS, Common::kPlatformWindows },
+	{ "4ce2d5b355964bbcb5e5ce73236ef868", "freddicove", "HE 100", "", Common::RU_RUS, Common::kPlatformWindows },
 	{ "4d34042713958b971cb139fba4658586", "atlantis", "", "", Common::JA_JPN, Common::kPlatformFMTowns },
 	{ "4dbff3787aedcd96b0b325f2d92d7ad9", "maze", "HE 100", "Updated", Common::EN_USA, Common::kPlatformUnknown },
 	{ "4dc780f1bc587a193ce8a97652791438", "loom", "EGA", "EGA", Common::EN_USA, Common::kPlatformAmiga },
@@ -185,7 +185,7 @@ static const MD5Table md5table[] = {
 	{ "58436e634f4fae1d9973591c2ffa1fcb", "spyfox", "HE 99", "", Common::EN_USA, Common::kPlatformUnknown },
 	{ "589601b676c98b1c0c987bc031ab68b3", "chase", "HE 95", "", Common::EN_USA, Common::kPlatformUnknown },
 	{ "58fdf4c7ad13540a734e18f8584cad89", "puttzoo", "", "", Common::EN_USA, Common::kPlatformMacintosh },
-	{ "590e6546aacd0d374b7f3a4f53013ab1", "freddicove", "", "", Common::UNK_LANG, Common::kPlatformUnknown },
+	{ "590e6546aacd0d374b7f3a4f53013ab1", "freddicove", "HE 100", "", Common::UNK_LANG, Common::kPlatformUnknown },
 	{ "59d5cfcc5e672a6e07baae01328b918b", "PuttTime", "HE 90", "Demo", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "5a35e36fd777e9c37a49c5b2faca52f9", "loom", "EGA", "EGA Demo", Common::EN_USA, Common::kPlatformPC },
 	{ "5b08000a9c47b2887df6506ac767ca68", "fbear", "HE 61", "", Common::EN_USA, Common::kPlatform3DO },
@@ -323,10 +323,10 @@ static const MD5Table md5table[] = {
 	{ "a0a7dea72003933b8b3f8b99b9f7ddeb", "loom", "No Adlib", "EGA", Common::EN_USA, Common::kPlatformAtariST },
 	{ "a194f15f51ee62badab74b9e7da97693", "baseball2001", "", "Demo", Common::EN_USA, Common::kPlatformUnknown },
 	{ "a28135a7ade38cc0208b04507c46efd1", "spyfox", "HE 99", "", Common::DE_DEU, Common::kPlatformUnknown },
-	{ "a2bb6aa0537402c1b3c2ea899ccef64b", "lost", "", "Demo", Common::EN_USA, Common::kPlatformWindows },
+	{ "a2bb6aa0537402c1b3c2ea899ccef64b", "lost", "HE 99", "Demo", Common::EN_USA, Common::kPlatformWindows },
 	{ "a3036878840720fbefa41e6965fa4a0a", "samnmax", "", "Floppy", Common::EN_USA, Common::kPlatformPC },
 	{ "a525c1753c1db5011c00417da37887ef", "PuttTime", "HE 100", "", Common::EN_USA, Common::kPlatformUnknown },
-	{ "a561d2e2413cc1c71d5a1bf87bf493ea", "lost", "", "", Common::EN_USA, Common::kPlatformUnknown },
+	{ "a561d2e2413cc1c71d5a1bf87bf493ea", "lost", "HE 100", "Updated", Common::EN_USA, Common::kPlatformUnknown },
 	{ "a570381b028972d891052ee1e51dc011", "maniac", "", "V2", Common::EN_USA, Common::kPlatformAtariST },
 	{ "a654fb60c3b67d6317a7894ffd9f25c5", "pajama3", "", "Demo", Common::EN_USA, Common::kPlatformUnknown },
 	{ "a7cacad9c40c4dc9e1812abf6c8af9d5", "puttcircus", "", "Demo", Common::EN_USA, Common::kPlatformUnknown },
@@ -350,7 +350,7 @@ static const MD5Table md5table[] = {
 	{ "b597e0403cc0002f69170e6caba7edd9", "indy3", "EGA", "EGA Demo", Common::EN_USA, Common::kPlatformPC },
 	{ "b628506f7def772e40de0aa5440fb8e1", "activity", "HE 70", "", Common::EN_USA, Common::kPlatformWindows },
 	{ "b886b0a5d909c7158a914e1d7c1c6c65", "loom", "EGA", "EGA", Common::FR_FRA, Common::kPlatformPC },
-	{ "b8955d7d23b4972229060d1592489fef", "freddicove", "", "", Common::NL_NLD, Common::kPlatformWindows },
+	{ "b8955d7d23b4972229060d1592489fef", "freddicove", "HE 100", "", Common::NL_NLD, Common::kPlatformWindows },
 	{ "b9ba19ce376efc69be78ef3baef8d2b9", "monkey", "Mac", "", Common::EN_USA, Common::kPlatformMacintosh },
 	{ "ba888e6831517597859e91aa173f945c", "spyfox", "", "Demo", Common::FR_FRA, Common::kPlatformUnknown },
 	{ "bbadf7309c4a2c2763e4bbba3c3be634", "freddi3", "", "Demo", Common::FR_FRA, Common::kPlatformUnknown },