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>

1 files changed, 4 insertions, 3 deletions

diff --git a/gui/massadd.cpp b/gui/massadd.cpp
index f4d857a528..1d1d119303 100644
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@ -207,7 +207,7 @@ void MassAddDialog::handleTickle() {
 			while (path != "/" && path.lastChar() == '/')
 				path.deleteLastChar();
 
-			// Check for existing config entries for this path/gameid/lang/platform combination
+			// Check for existing config entries for this path/engineid/gameid/lang/platform combination
 			if (_pathToTargets.contains(path)) {
 				Common::String resultPlatformCode = Common::getPlatformCode(result.platform);
 				Common::String resultLanguageCode = Common::getLanguageCode(result.language);
@@ -215,11 +215,12 @@ void MassAddDialog::handleTickle() {
 				bool duplicate = false;
 				const StringArray &targets = _pathToTargets[path];
 				for (StringArray::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) {
-					// If the gameid, platform and language match -> skip it
+					// If the engineid, gameid, platform and language match -> skip it
 					Common::ConfigManager::Domain *dom = ConfMan.getDomain(*iter);
 					assert(dom);
 
-					if ((*dom)["gameid"] == result.gameId &&
+					if ((*dom)["engineid"] == result.engineId &&
+						(*dom)["gameid"] == result.gameId &&
 					    (*dom)["platform"] == resultPlatformCode &&
 					    (*dom)["language"] == resultLanguageCode) {
 						duplicate = true;