aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-04-05 22:29:08 +0000
committerMax Horn2008-04-05 22:29:08 +0000
commit29f1e6de384dc0828de0988ba140b839492c97e3 (patch)
treee4ee4c38fde490954dcf72d2e441fe5290a8a678
parentbfdca912bc7ef42dfc6377f80fec06c64a265c23 (diff)
downloadscummvm-rg350-29f1e6de384dc0828de0988ba140b839492c97e3.tar.gz
scummvm-rg350-29f1e6de384dc0828de0988ba140b839492c97e3.tar.bz2
scummvm-rg350-29f1e6de384dc0828de0988ba140b839492c97e3.zip
Advanced detector: replaced kADFlagAugmentPreferredTarget by its inverse, kADFlagDontAugmentPreferredTarget (since all AdvDetector engines except Kyra used kADFlagAugmentPreferredTarget, it seems reasonable to assume that as default)
svn-id: r31413
-rw-r--r--common/advancedDetector.cpp2
-rw-r--r--common/advancedDetector.h2
-rw-r--r--engines/agi/detection.cpp2
-rw-r--r--engines/agos/detection.cpp2
-rw-r--r--engines/cine/detection.cpp2
-rw-r--r--engines/cruise/detection.cpp2
-rw-r--r--engines/drascula/detection.cpp2
-rw-r--r--engines/gob/detection.cpp2
-rw-r--r--engines/igor/detection.cpp2
-rw-r--r--engines/kyra/detection.cpp2
-rw-r--r--engines/lure/detection.cpp2
-rw-r--r--engines/parallaction/detection.cpp2
-rw-r--r--engines/saga/detection.cpp2
-rw-r--r--engines/touche/detection.cpp2
14 files changed, 14 insertions, 14 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
index cb3c5146f6..e7120a620b 100644
--- a/common/advancedDetector.cpp
+++ b/common/advancedDetector.cpp
@@ -178,7 +178,7 @@ static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *
desc["gameid"] = params.singleid;
}
- if (params.flags & kADFlagAugmentPreferredTarget) {
+ if (!(params.flags & kADFlagDontAugmentPreferredTarget)) {
if (!desc.contains("preferredtarget"))
desc["preferredtarget"] = desc["gameid"];
diff --git a/common/advancedDetector.h b/common/advancedDetector.h
index 94e21a3a9b..9794ddabf5 100644
--- a/common/advancedDetector.h
+++ b/common/advancedDetector.h
@@ -103,7 +103,7 @@ enum ADFlags {
* 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)
};
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 100721e3b7..3aef00bf97 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -2085,7 +2085,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
} // End of namespace Agi
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index fd56651a70..90f593f7c9 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -94,7 +94,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class AgosMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 750c07aa14..2b8af918af 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -483,7 +483,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class CineMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index b9330ada77..d6108ab909 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -118,7 +118,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class CruiseMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index e2042bf93f..2c057ad03a 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -142,7 +142,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class DrasculaMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 2055cc3ade..4bd6668f5c 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -1867,7 +1867,7 @@ static const ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
Gob::fileBased,
// Flags
- kADFlagAugmentPreferredTarget
+ 0
};
class GobMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/igor/detection.cpp b/engines/igor/detection.cpp
index d63c280347..400db95f20 100644
--- a/engines/igor/detection.cpp
+++ b/engines/igor/detection.cpp
@@ -101,7 +101,7 @@ static const Common::ADParams igorDetectionParams = {
0,
"igor",
0,
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class IgorMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 4a0ba0fc26..3818990ecc 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -437,7 +437,7 @@ const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- 0
+ Common::kADFlagDontAugmentPreferredTarget
};
} // End of anonymous namespace
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index ea1835ff86..b498ec7f61 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -169,7 +169,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget | Common::kADFlagUseExtraAsHint
+ Common::kADFlagUseExtraAsHint
};
class LureMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index b350dfcb87..352c5a2d01 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -179,7 +179,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class ParallactionMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 565d781e98..687018f491 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -136,7 +136,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagAugmentPreferredTarget
+ 0
};
class SagaMetaEngine : public Common::AdvancedMetaEngine {
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 2277adf6f6..faf997812c 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -120,7 +120,7 @@ static const Common::ADParams detectionParams = {
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 {