[Scummvm-cvs-logs] scummvm master -> 65c60ef02737f9e6a7e4091b622a6a1e0871d6d7

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
170f9f7040 Revert "SCI: Do not set _singleId in SciMetaEngine"
65c60ef027 ENGINES: Add a thorough explanation of the ugliness caused by _singleId


Commit: 170f9f7040be7ac5ae8f05a9d2bd346e7776bcd1
    https://github.com/scummvm/scummvm/commit/170f9f7040be7ac5ae8f05a9d2bd346e7776bcd1
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-02-28T01:08:46-08:00

Commit Message:
Revert "SCI: Do not set _singleId in SciMetaEngine"

This reverts commit 8248944f1eb313f101e966a04aa93cb7db82559e.

Changed paths:
    engines/sci/detection.cpp



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index bef357f..c438490 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -381,6 +381,7 @@ static char s_fallbackGameIdBuf[256];
 class SciMetaEngine : public AdvancedMetaEngine {
 public:
 	SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles) {
+		_singleid = "sci";
 	}
 
 	virtual const char *getName() const {


Commit: 65c60ef02737f9e6a7e4091b622a6a1e0871d6d7
    https://github.com/scummvm/scummvm/commit/65c60ef02737f9e6a7e4091b622a6a1e0871d6d7
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-02-28T01:13:40-08:00

Commit Message:
ENGINES: Add a thorough explanation of the ugliness caused by _singleId

Changed paths:
    engines/advancedDetector.h



diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 2c7d9cc..d43462b 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -171,8 +171,18 @@ protected:
 	/**
 	 * Name of single gameid (optional).
 	 *
-	 * If set, the target ID will always be set to this one. Probably useful
-	 * for engines with few game targets.
+	 * If set, the target ID will always be set to this one. Currently, it is a
+	 * necessary evil to avoid polluting the global namespace with loads of IDs.
+	 * Needed for engines that define a lot of game targets, so that there won't
+	 * be a situation where two different engines define the same game ID.
+	 *
+	 * FIXME: Remove this field altogether! This is a temporary (and ugly)
+	 * workaround to a more generic problem.
+	 *
+	 * TODO: A more correct way to do this would be to distinguish targets with
+	 * a singleid-gameid combination, so that there will never be a duplicate
+	 * game ID across different engines.
+	 *
 	 */
 	const char *_singleid;