[Scummvm-cvs-logs] scummvm master -> e61f1bd091f7fb5beb9a2037427a6d5ed2dc3793

[somaen]

This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6db82968fb Revert "WINTERMUTE: Prevent warning about duplicate files when autodetecting."
1e1e502628 WINTERMUTE: Add detection entry for Beyond the Threshold.
c3022b537a WINTERMUTE: Minor formatting fix.
4f98984fbd WINTERMUTE: Add detection entry for The Trader of Stories (Demo)
e61f1bd091 WINTERMUTE: Add detection for Des Reves Elastiques Avec Mille Insectes Nommes Georges


Commit: 6db82968fba459bf41d30ca6b6ebfcf9f1276729
    https://github.com/scummvm/scummvm/commit/6db82968fba459bf41d30ca6b6ebfcf9f1276729
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-06-18T13:05:15-07:00

Commit Message:
Revert "WINTERMUTE: Prevent warning about duplicate files when autodetecting."

This reverts commit 4401f40f7203f7aaa78c2e1c904c70902325436c.

Changed paths:
    engines/wintermute/wintermute.cpp



diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 9238174..89a6f1b 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -292,6 +292,7 @@ bool WintermuteEngine::getGameInfo(const Common::FSList &fslist, Common::String
 	Common::SeekableReadStream *stream = nullptr;
 	// Quick-fix, instead of possibly breaking the persistence-system, let's just roll with it
 	BaseFileManager *fileMan = new BaseFileManager(Common::UNK_LANG, true);
+	fileMan->registerPackages(fslist);
 	stream = fileMan->openFile("startup.settings", false, false);
 
 	// The process is as follows: Check the "GAME=" tag in startup.settings, to decide where the


Commit: 1e1e502628f23425ea489fb9f646eef0d786f8e5
    https://github.com/scummvm/scummvm/commit/1e1e502628f23425ea489fb9f646eef0d786f8e5
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-06-18T13:15:09-07:00

Commit Message:
WINTERMUTE: Add detection entry for Beyond the Threshold.

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 00ec51a..ce35e95 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -27,6 +27,7 @@ namespace Wintermute {
 static const PlainGameDescriptor wintermuteGames[] = {
 	{"5ld",             "Five Lethal Demons"},
 	{"5ma",             "Five Magical Amulets"},
+	{"bthreshold",      "Beyond the Threshold"},
 	{"actualdest",      "Actual Destination"},
 	{"carolreed4",      "Carol Reed 4 - East Side Story"},
 	{"carolreed5",      "Carol Reed 5 - The Colour of Murder"},
@@ -83,6 +84,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// Beyond the Threshold
+	{
+		"bthreshold",
+		"",
+		AD_ENTRY1s("data.dcp", "d49bf9ccb2e74507447c82d6ad3e2bc4", 12773712),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// Carol Reed 4 - East Side Story (Demo)
 	{
 		"carolreed4",


Commit: c3022b537a02cc1af2bd691ece53fb25855ff6f1
    https://github.com/scummvm/scummvm/commit/c3022b537a02cc1af2bd691ece53fb25855ff6f1
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-06-18T13:27:19-07:00

Commit Message:
WINTERMUTE: Minor formatting fix.

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index ce35e95..eb04fd7 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -45,7 +45,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"mirage",          "Mirage"},
 	{"pigeons",         "Pigeons in the Park"},
 	{"reversion1",      "Reversion: The Escape"},
-	{"reversion2",	    "Reversion: The Meeting"},
+	{"reversion2",      "Reversion: The Meeting"},
 	{"rosemary",        "Rosemary"},
 	{"thebox",          "The Box"},
 	{"twc",             "the white chamber"},


Commit: 4f98984fbd45f9ec708facad2ceaf7df5f6dbb46
    https://github.com/scummvm/scummvm/commit/4f98984fbd45f9ec708facad2ceaf7df5f6dbb46
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-06-18T13:29:13-07:00

Commit Message:
WINTERMUTE: Add detection entry for The Trader of Stories (Demo)

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index eb04fd7..8fb45dc 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -48,6 +48,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"reversion2",      "Reversion: The Meeting"},
 	{"rosemary",        "Rosemary"},
 	{"thebox",          "The Box"},
+	{"tradestory",		"The Trader of Stories"},
 	{"twc",             "the white chamber"},
 	{"wintermute",      "Wintermute engine game"},
 	{0, 0}
@@ -556,6 +557,17 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// The Trader of Stories
+	{
+		"tradestory",
+		"Demo",
+		AD_ENTRY1s("data.dcp", "0a0b51191636cc8ead89b905281c3218", 40401902),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE |
+		ADGF_DEMO,
+		GUIO0()
+	},
 	// the white chamber (multi-language)
 	{
 		"twc",


Commit: e61f1bd091f7fb5beb9a2037427a6d5ed2dc3793
    https://github.com/scummvm/scummvm/commit/e61f1bd091f7fb5beb9a2037427a6d5ed2dc3793
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-06-18T14:05:21-07:00

Commit Message:
WINTERMUTE: Add detection for Des Reves Elastiques Avec Mille Insectes Nommes Georges

With the accents removed to avoid breaking encoding.

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 8fb45dc..9f654dc 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -37,6 +37,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"carolreed9",      "Carol Reed 9 - Cold Case Summer"},
 	{"chivalry",        "Chivalry is Not Dead"},
 	{"deadcity",        "Dead City"},
+	{"dreaming",        "Des Reves Elastiques Avec Mille Insectes Nommes Georges"},
 	{"dirtysplit",      "Dirty Split"},
 	{"dreamscape",      "Dreamscape"},
 	{"ghostsheet",      "Ghost in the Sheet"},
@@ -249,6 +250,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// Des Reves Elastiques Avec Mille Insectes Nommes Georges
+	{
+		"dreaming",
+		"",
+		AD_ENTRY1s("data.dcp", "4af26d97ea063fc1277ce30ae431de90", 8804073),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// Dreamscape
 	{
 		"dreamscape",