ENGINES: Change targets to have an 'engine ID'

The engine ID identifies which engine should be used to launch the target.
Also remove the 'single ID' system. Different games from engines that used
that system now have different game IDs.

Also-By: Matthew Hoops <clone2727@gmail.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index b4d5bff84c..1e465e9827 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -104,27 +104,27 @@
 namespace Glk {
 
 GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename) :
-		DetectedGame(id, desc, Common::EN_ANY, Common::kPlatformUnknown) {
+		DetectedGame("glk", id, desc, Common::EN_ANY, Common::kPlatformUnknown) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 }
 
 GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
-		Common::Language lang) : DetectedGame(id, desc, lang, Common::kPlatformUnknown) {
+		Common::Language lang) : DetectedGame("glk", id, desc, lang, Common::kPlatformUnknown) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 }
 
 GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const char *xtra,
 		const Common::String &filename, Common::Language lang) :
-		DetectedGame(id, desc, lang, Common::kPlatformUnknown, xtra) {
+		DetectedGame("glk", id, desc, lang, Common::kPlatformUnknown, xtra) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 }
 
 GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
 		const Common::String &md5, size_t filesize) :
-		DetectedGame(id, desc, Common::UNK_LANG, Common::kPlatformUnknown) {
+		DetectedGame("glk", id, desc, Common::UNK_LANG, Common::kPlatformUnknown) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 
diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index d4ffee33a3..f699c832a9 100644
--- a/engines/glk/frotz/detection.cpp
+++ b/engines/glk/frotz/detection.cpp
@@ -123,7 +123,7 @@ bool FrotzMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
 			gameList.push_back(GlkDetectedGame(desc.gameId, desc.description, filename, md5, filesize));
 		} else {
 			GameDescriptor gameDesc = findGame(p->_gameId);
-			DetectedGame gd = DetectedGame(p->_gameId, gameDesc._description, p->_language, Common::kPlatformUnknown, p->_extra);
+			DetectedGame gd = DetectedGame("glk", p->_gameId, gameDesc._description, p->_language, Common::kPlatformUnknown, p->_extra);
 			gd.setGUIOptions(p->_guiOptions);
 
 			gd.addExtraEntry("filename", filename);
diff --git a/engines/glk/level9/detection.cpp b/engines/glk/level9/detection.cpp
index 5788c0f95c..a366bc0f9b 100644
--- a/engines/glk/level9/detection.cpp
+++ b/engines/glk/level9/detection.cpp
@@ -752,7 +752,7 @@ bool Level9MetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
 			continue;
 
 		// Found the game, add a detection entry
-		DetectedGame gd = DetectedGame(game->gameId, game->name, Common::UNK_LANG,
+		DetectedGame gd = DetectedGame("glk", game->gameId, game->name, Common::UNK_LANG,
 			Common::kPlatformUnknown, game->extra);
 		gd.addExtraEntry("filename", filename);
 		gameList.push_back(gd);
diff --git a/engines/glk/tads/detection.cpp b/engines/glk/tads/detection.cpp
index 7bca1bb83b..9c0c5eb6bf 100644
--- a/engines/glk/tads/detection.cpp
+++ b/engines/glk/tads/detection.cpp
@@ -110,7 +110,7 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
 			gameList.push_back(GlkDetectedGame(desc._gameId, desc._description, filename, md5, filesize));
 		} else {
 			PlainGameDescriptor gameDesc = findGame(p->_gameId);
-			gd = DetectedGame(p->_gameId, gameDesc.description, p->_language, Common::kPlatformUnknown, p->_extra);
+			gd = DetectedGame("glk", p->_gameId, gameDesc.description, p->_language, Common::kPlatformUnknown, p->_extra);
 			gd.addExtraEntry("filename", filename);
 			gameList.push_back(gd);
 		}