aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-02-13 13:17:46 +0000
committerMax Horn2007-02-13 13:17:46 +0000
commit2afe07992fdabc07d004a629cf7a79cbfd94f604 (patch)
tree2dffc22787cd52271ebd2c3cf33dd66c2f76e593
parent287e21d36e047533fdf1b57cec5f123bdf75f8a6 (diff)
downloadscummvm-rg350-2afe07992fdabc07d004a629cf7a79cbfd94f604.tar.gz
scummvm-rg350-2afe07992fdabc07d004a629cf7a79cbfd94f604.tar.bz2
scummvm-rg350-2afe07992fdabc07d004a629cf7a79cbfd94f604.zip
Renamed kADFlagComplexID to kADFlagAugmentPreferredTarget, document it, and add it for AGOS, too
svn-id: r25543
-rw-r--r--common/advancedDetector.cpp2
-rw-r--r--common/advancedDetector.h6
-rw-r--r--engines/agi/detection.cpp2
-rw-r--r--engines/agos/game.cpp2
-rw-r--r--engines/cine/detection.cpp2
-rw-r--r--engines/gob/detection.cpp2
-rw-r--r--engines/parallaction/detection.cpp2
-rw-r--r--engines/saga/game.cpp2
8 files changed, 12 insertions, 8 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
index cd46cfca1d..463a3b62ca 100644
--- a/common/advancedDetector.cpp
+++ b/common/advancedDetector.cpp
@@ -170,7 +170,7 @@ GameList detectAllGames(
desc["gameid"] = params.singleid;
}
- if (params.flags & kADFlagComplexID) {
+ if (params.flags & kADFlagAugmentPreferredTarget) {
if (!desc.contains("preferredtarget"))
desc["preferredtarget"] = desc["gameid"];
diff --git a/common/advancedDetector.h b/common/advancedDetector.h
index 30481181c5..abd974ff46 100644
--- a/common/advancedDetector.h
+++ b/common/advancedDetector.h
@@ -67,7 +67,11 @@ struct ADObsoleteGameID {
};
enum ADFlags {
- kADFlagComplexID = (1 << 0), // Generate complex suggested IDs
+ /**
+ * Generate/augment preferred target with information on the language (if
+ * not equal to english) and platform (if not equal to PC).
+ */
+ kADFlagAugmentPreferredTarget = (1 << 0),
kADFlagFilebasedFallback = (1 << 1) // Use file based fallback detection
};
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index b9dad2580a..192422014b 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -1739,7 +1739,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagComplexID
+ Common::kADFlagAugmentPreferredTarget
};
ADVANCED_DETECTOR_DEFINE_PLUGIN(AGI, Agi::AgiEngine, Agi::GAME_detectGames, detectionParams);
diff --git a/engines/agos/game.cpp b/engines/agos/game.cpp
index 8652cb726b..071aae9fd3 100644
--- a/engines/agos/game.cpp
+++ b/engines/agos/game.cpp
@@ -98,7 +98,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- 0
+ Common::kADFlagAugmentPreferredTarget
};
ADVANCED_DETECTOR_DEFINE_PLUGIN(AGOS, AGOS::AGOSEngine, AGOS::GAME_detectGames, detectionParams);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index ba4858fe77..21f8108061 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::kADFlagComplexID
+ Common::kADFlagAugmentPreferredTarget
};
ADVANCED_DETECTOR_DEFINE_PLUGIN(CINE, Cine::CineEngine, Cine::GAME_detectGames, detectionParams);
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 38af843a0f..050dc5b7dd 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -915,7 +915,7 @@ static const ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
Gob::fileBased,
// Flags
- kADFlagComplexID | kADFlagFilebasedFallback
+ kADFlagAugmentPreferredTarget | kADFlagFilebasedFallback
};
ADVANCED_DETECTOR_DEFINE_PLUGIN(GOB, Gob::GobEngine, Gob::GAME_detectGames, detectionParams);
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 32b62e1d75..6624263b1d 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -97,7 +97,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagComplexID
+ Common::kADFlagAugmentPreferredTarget
};
ADVANCED_DETECTOR_DEFINE_PLUGIN(PARALLACTION, Parallaction::Parallaction, Parallaction::GAME_detectGames, detectionParams);
diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp
index 24dfd41398..aaec2dad2f 100644
--- a/engines/saga/game.cpp
+++ b/engines/saga/game.cpp
@@ -117,7 +117,7 @@ static const Common::ADParams detectionParams = {
// List of files for file-based fallback detection (optional)
0,
// Flags
- Common::kADFlagComplexID
+ Common::kADFlagAugmentPreferredTarget
};
ADVANCED_DETECTOR_DEFINE_PLUGIN(SAGA, Saga::SagaEngine, Saga::GAME_detectGames, detectionParams);