[Scummvm-cvs-logs] SF.net SVN: scummvm: [31413] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Apr 6 00:29:08 CEST 2008 

Revision: 31413
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31413&view=rev
Author:   fingolfin
Date:     2008-04-05 15:29:08 -0700 (Sat, 05 Apr 2008)

Log Message:
-----------
Advanced detector: replaced kADFlagAugmentPreferredTarget by its inverse, kADFlagDontAugmentPreferredTarget (since all AdvDetector engines except Kyra used kADFlagAugmentPreferredTarget, it seems reasonable to assume that as default)

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp
    scummvm/trunk/common/advancedDetector.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agos/detection.cpp
    scummvm/trunk/engines/cine/detection.cpp
    scummvm/trunk/engines/cruise/detection.cpp
    scummvm/trunk/engines/drascula/detection.cpp
    scummvm/trunk/engines/gob/detection.cpp
    scummvm/trunk/engines/igor/detection.cpp
    scummvm/trunk/engines/kyra/detection.cpp
    scummvm/trunk/engines/lure/detection.cpp
    scummvm/trunk/engines/parallaction/detection.cpp
    scummvm/trunk/engines/saga/detection.cpp
    scummvm/trunk/engines/touche/detection.cpp

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/common/advancedDetector.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -178,7 +178,7 @@
 		desc["gameid"] = params.singleid;
 	}
 
-	if (params.flags & kADFlagAugmentPreferredTarget) {
+	if (!(params.flags & kADFlagDontAugmentPreferredTarget)) {
 		if (!desc.contains("preferredtarget"))
 			desc["preferredtarget"] = desc["gameid"];
 

Modified: scummvm/trunk/common/advancedDetector.h
===================================================================
--- scummvm/trunk/common/advancedDetector.h	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/common/advancedDetector.h	2008-04-05 22:29:08 UTC (rev 31413)
@@ -103,7 +103,7 @@
 	 * Generate/augment preferred target with information on the language (if
 	 * not equal to english) and platform (if not equal to PC).
 	 */
-	kADFlagAugmentPreferredTarget = (1 << 0),
+	kADFlagDontAugmentPreferredTarget = (1 << 0),
 	kADFlagPrintWarningOnFileBasedFallback = (1 << 1),
 	kADFlagUseExtraAsHint = (1 << 2)
 };

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/agi/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -2085,7 +2085,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 } // End of namespace Agi

Modified: scummvm/trunk/engines/agos/detection.cpp
===================================================================
--- scummvm/trunk/engines/agos/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/agos/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -94,7 +94,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class AgosMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/cine/detection.cpp
===================================================================
--- scummvm/trunk/engines/cine/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/cine/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -483,7 +483,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class CineMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/cruise/detection.cpp
===================================================================
--- scummvm/trunk/engines/cruise/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/cruise/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -118,7 +118,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class CruiseMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/drascula/detection.cpp
===================================================================
--- scummvm/trunk/engines/drascula/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/drascula/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -142,7 +142,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class DrasculaMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/gob/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -1867,7 +1867,7 @@
 	// List of files for file-based fallback detection (optional)
 	Gob::fileBased,
 	// Flags
-	kADFlagAugmentPreferredTarget
+	0
 };
 
 class GobMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/igor/detection.cpp
===================================================================
--- scummvm/trunk/engines/igor/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/igor/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -101,7 +101,7 @@
 	0,
 	"igor",
 	0,
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class IgorMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/kyra/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -437,7 +437,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	0
+	Common::kADFlagDontAugmentPreferredTarget
 };
 
 } // End of anonymous namespace

Modified: scummvm/trunk/engines/lure/detection.cpp
===================================================================
--- scummvm/trunk/engines/lure/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/lure/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -169,7 +169,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget | Common::kADFlagUseExtraAsHint
+	Common::kADFlagUseExtraAsHint
 };
 
 class LureMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/parallaction/detection.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/parallaction/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -179,7 +179,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class ParallactionMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/saga/detection.cpp
===================================================================
--- scummvm/trunk/engines/saga/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/saga/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -136,7 +136,7 @@
 	// List of files for file-based fallback detection (optional)
 	0,
 	// Flags
-	Common::kADFlagAugmentPreferredTarget
+	0
 };
 
 class SagaMetaEngine : public Common::AdvancedMetaEngine {

Modified: scummvm/trunk/engines/touche/detection.cpp
===================================================================
--- scummvm/trunk/engines/touche/detection.cpp	2008-04-05 17:33:54 UTC (rev 31412)
+++ scummvm/trunk/engines/touche/detection.cpp	2008-04-05 22:29:08 UTC (rev 31413)
@@ -120,7 +120,7 @@
 	0, // no obsolete targets data
 	"touche",
 	Touche::fileBasedFallback, // file-based detection data to enable not yet known versions to start
-	Common::kADFlagAugmentPreferredTarget | Common::kADFlagPrintWarningOnFileBasedFallback
+	Common::kADFlagPrintWarningOnFileBasedFallback
 };
 
 class ToucheMetaEngine : public Common::AdvancedMetaEngine {


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

More information about the Scummvm-git-logs mailing list