[Scummvm-cvs-logs] SF.net SVN: scummvm:[34213] scummvm/trunk/engines/tinsel/detection.cpp

[fingolfin at users.sourceforge.net]

Revision: 34213
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34213&view=rev
Author:   fingolfin
Date:     2008-08-30 22:09:35 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
TINSEL: Remove some unused code; and duplicated the 4-FLAGS version detection entry (one copy for each language) for the user's convenience

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/detection.cpp

Modified: scummvm/trunk/engines/tinsel/detection.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/detection.cpp	2008-08-30 21:51:13 UTC (rev 34212)
+++ scummvm/trunk/engines/tinsel/detection.cpp	2008-08-30 22:09:35 UTC (rev 34213)
@@ -144,15 +144,81 @@
 				{"spanish.txt", 0, NULL, -1},
 				{NULL, 0, NULL, 0}
 			},
-			Common::UNK_LANG,
+			Common::FR_FRA,
 			Common::kPlatformPC,
-			Common::ADGF_NO_FLAGS
+			Common::ADGF_DROPLANGUAGE
 		},
 		GID_DW1,
 		0,
 		GF_CD | GF_USE_4FLAGS,
 		TINSEL_V1,
 	},
+	{
+		{
+			"dw",
+			"CD",
+			{
+				{"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
+				{"english.smp", 0, NULL, -1},
+				{"french.txt", 0, NULL, -1},
+				{"german.txt", 0, NULL, -1},
+				{"italian.txt", 0, NULL, -1},
+				{"spanish.txt", 0, NULL, -1},
+				{NULL, 0, NULL, 0}
+			},
+			Common::DE_DEU,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		GID_DW1,
+		0,
+		GF_CD | GF_USE_4FLAGS,
+		TINSEL_V1,
+	},
+	{
+		{
+			"dw",
+			"CD",
+			{
+				{"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
+				{"english.smp", 0, NULL, -1},
+				{"french.txt", 0, NULL, -1},
+				{"german.txt", 0, NULL, -1},
+				{"italian.txt", 0, NULL, -1},
+				{"spanish.txt", 0, NULL, -1},
+				{NULL, 0, NULL, 0}
+			},
+			Common::IT_ITA,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		GID_DW1,
+		0,
+		GF_CD | GF_USE_4FLAGS,
+		TINSEL_V1,
+	},
+	{
+		{
+			"dw",
+			"CD",
+			{
+				{"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
+				{"english.smp", 0, NULL, -1},
+				{"french.txt", 0, NULL, -1},
+				{"german.txt", 0, NULL, -1},
+				{"italian.txt", 0, NULL, -1},
+				{"spanish.txt", 0, NULL, -1},
+				{NULL, 0, NULL, 0}
+			},
+			Common::ES_ESP,
+			Common::kPlatformPC,
+			Common::ADGF_DROPLANGUAGE
+		},
+		GID_DW1,
+		0,
+		GF_CD | GF_USE_4FLAGS,
+		TINSEL_V1,
+	},
 
 	{	// English CD with SCN files
 		{
@@ -213,25 +279,6 @@
 	{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
 };
 
-/**
- * The fallback game descriptor used by the Tinsel engine's fallbackDetector.
- * Contents of this struct are to be overwritten by the fallbackDetector.
- */
-static TinselGameDescription g_fallbackDesc = {
-	{
-		"",
-		"",
-		AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor
-		Common::UNK_LANG,
-		Common::kPlatformPC,
-		Common::ADGF_NO_FLAGS
-	},
-	0,
-	0,
-	0,
-	0,
-};
-
 } // End of namespace Tinsel
 
 static const Common::ADParams detectionParams = {
@@ -267,8 +314,6 @@
 
 	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 
-	const Common::ADGameDescription *fallbackDetect(const FSList *fslist) const;
-
 };
 
 bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
@@ -279,21 +324,6 @@
 	return gd != 0;
 }
 
-const Common::ADGameDescription *TinselMetaEngine::fallbackDetect(const FSList *fslist) const {
-	// Set the default values for the fallback descriptor's ADGameDescription part.
-	Tinsel::g_fallbackDesc.desc.language = Common::UNK_LANG;
-	Tinsel::g_fallbackDesc.desc.platform = Common::kPlatformPC;
-	Tinsel::g_fallbackDesc.desc.flags = Common::ADGF_NO_FLAGS;
-
-	// Set default values for the fallback descriptor's TinselGameDescription part.
-	Tinsel::g_fallbackDesc.gameID = 0;
-	Tinsel::g_fallbackDesc.features = 0;
-	Tinsel::g_fallbackDesc.version = 0;
-
-	//return (const Common::ADGameDescription *)&Tinsel::g_fallbackDesc;
-	return NULL;
-}
-
 #if PLUGIN_ENABLED_DYNAMIC(TINSEL)
 	REGISTER_PLUGIN_DYNAMIC(TINSEL, PLUGIN_TYPE_ENGINE, TinselMetaEngine);
 #else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.