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

[fingolfin at users.sourceforge.net]

Revision: 25543
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25543&view=rev
Author:   fingolfin
Date:     2007-02-13 05:17:46 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Renamed kADFlagComplexID to kADFlagAugmentPreferredTarget, document it, and add it for AGOS, too

Modified Paths:
--------------
    scummvm/trunk/common/advancedDetector.cpp
    scummvm/trunk/common/advancedDetector.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agos/game.cpp
    scummvm/trunk/engines/cine/detection.cpp
    scummvm/trunk/engines/gob/detection.cpp
    scummvm/trunk/engines/parallaction/detection.cpp
    scummvm/trunk/engines/saga/game.cpp

Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/common/advancedDetector.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -170,7 +170,7 @@
 			desc["gameid"] = params.singleid;
 		}
 
-		if (params.flags & kADFlagComplexID) {
+		if (params.flags & kADFlagAugmentPreferredTarget) {
 			if (!desc.contains("preferredtarget"))
 				desc["preferredtarget"] = desc["gameid"];
 

Modified: scummvm/trunk/common/advancedDetector.h
===================================================================
--- scummvm/trunk/common/advancedDetector.h	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/common/advancedDetector.h	2007-02-13 13:17:46 UTC (rev 25543)
@@ -67,7 +67,11 @@
 };
 
 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
 };
 

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -1739,7 +1739,7 @@
 	// 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);

Modified: scummvm/trunk/engines/agos/game.cpp
===================================================================
--- scummvm/trunk/engines/agos/game.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/engines/agos/game.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -98,7 +98,7 @@
 	// 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);

Modified: scummvm/trunk/engines/cine/detection.cpp
===================================================================
--- scummvm/trunk/engines/cine/detection.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/engines/cine/detection.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -483,7 +483,7 @@
 	// 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);

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/engines/gob/detection.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -915,7 +915,7 @@
 	// 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);

Modified: scummvm/trunk/engines/parallaction/detection.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/detection.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/engines/parallaction/detection.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -97,7 +97,7 @@
 	// 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);

Modified: scummvm/trunk/engines/saga/game.cpp
===================================================================
--- scummvm/trunk/engines/saga/game.cpp	2007-02-13 13:04:51 UTC (rev 25542)
+++ scummvm/trunk/engines/saga/game.cpp	2007-02-13 13:17:46 UTC (rev 25543)
@@ -117,7 +117,7 @@
 	// 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);


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