Moved AdvancedDetector from common/ to engines/

svn-id: r36132

3 files changed, 0 insertions, 741 deletions

diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
deleted file mode 100644
index e3637e81c9..0000000000
--- a/common/advancedDetector.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "base/plugins.h"
-
-#include "common/util.h"
-#include "common/hash-str.h"
-#include "common/file.h"
-#include "common/md5.h"
-#include "common/advancedDetector.h"
-#include "common/config-manager.h"
-
-namespace Common {
-
-/**
- * A list of pointers to ADGameDescription structs (or subclasses thereof).
- */
-typedef Array<const ADGameDescription*> ADGameDescList;
-
-
-/**
- * Detect games in specified directory.
- * Parameters language and platform are used to pass on values
- * specified by the user. I.e. this is used to restrict search scope.
- *
- * @param fslist	FSList to scan or NULL for scanning all specified
- *  default directories.
- * @param params	a ADParams struct containing various parameters
- * @param language	restrict results to specified language only
- * @param platform	restrict results to specified platform only
- * @return	list of ADGameDescription (or subclass) pointers corresponding to matched games
- */
-static ADGameDescList detectGame(const FSList &fslist, const Common::ADParams &params, Language language, Platform platform, const Common::String extra);
-
-
-/**
- * Returns list of targets supported by the engine.
- * Distinguishes engines with single ID
- */
-static GameList gameIDList(const Common::ADParams &params) {
-	if (params.singleid != NULL) {
-		GameList gl;
-
-		const PlainGameDescriptor *g = params.list;
-		while (g->gameid) {
-			if (0 == scumm_stricmp(params.singleid, g->gameid)) {
-				gl.push_back(GameDescriptor(g->gameid, g->description));
-
-				return gl;
-			}
-			g++;
-		}
-		error("Engine %s doesn't have its singleid specified in ids list", params.singleid);
-	}
-
-	return GameList(params.list);
-}
-
-static void upgradeTargetIfNecessary(const Common::ADParams &params) {
-	if (params.obsoleteList == 0)
-		return;
-
-	String gameid = ConfMan.get("gameid");
-
-	for (const Common::ADObsoleteGameID *o = params.obsoleteList; o->from; ++o) {
-		if (gameid.equalsIgnoreCase(o->from)) {
-			gameid = o->to;
-			ConfMan.set("gameid", gameid);
-
-			if (o->platform != Common::kPlatformUnknown)
-				ConfMan.set("platform", Common::getPlatformCode(o->platform));
-
-			warning("Target upgraded from %s to %s", o->from, o->to);
-
-			// WORKAROUND: Fix for bug #1719463: "DETECTOR: Launching
-			// undefined target adds launcher entry"
-			if (ConfMan.hasKey("id_came_from_command_line")) {
-				warning("Target came from command line. Skipping save");
-			} else {
-				ConfMan.flushToDisk();
-			}
-			break;
-		}
-	}
-}
-
-namespace AdvancedDetector {
-
-GameDescriptor findGameID(
-	const char *gameid,
-	const PlainGameDescriptor *list,
-	const Common::ADObsoleteGameID *obsoleteList
-	) {
-	// First search the list of supported game IDs for a match.
-	const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, list);
-	if (g)
-		return GameDescriptor(*g);
-
-	// If we didn't find the gameid in the main list, check if it
-	// is an obsolete game id.
-	if (obsoleteList != 0) {
-		const Common::ADObsoleteGameID *o = obsoleteList;
-		while (o->from) {
-			if (0 == scumm_stricmp(gameid, o->from)) {
-				g = findPlainGameDescriptor(o->to, list);
-				if (g && g->description)
-					return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")");
-				else
-					return GameDescriptor(gameid, "Obsolete game ID");
-			}
-			o++;
-		}
-	}
-
-	// No match found
-	return GameDescriptor();
-}
-
-}	// End of namespace AdvancedDetector
-
-static GameDescriptor toGameDescriptor(const ADGameDescription &g, const PlainGameDescriptor *sg) {
-	const char *title = 0;
-
-	while (sg->gameid) {
-		if (!scumm_stricmp(g.gameid, sg->gameid))
-			title = sg->description;
-		sg++;
-	}
-
-	GameDescriptor gd(g.gameid, title, g.language, g.platform);
-	gd.updateDesc(g.extra);
-	return gd;
-}
-
-/**
- * Generate a preferred target value as
- *   GAMEID-PLAFORM-LANG
- * or (if ADGF_DEMO has been set)
- *   GAMEID-demo-PLAFORM-LANG
- */
-static String generatePreferredTarget(const String &id, const ADGameDescription *desc) {
-	String res(id);
-
-	if (desc->flags & ADGF_DEMO) {
-		res = res + "-demo";
-	}
-
-	if (desc->flags & ADGF_CD) {
-		res = res + "-cd";
-	}
-
-	if (desc->platform != kPlatformPC && desc->platform != kPlatformUnknown) {
-		res = res + "-" + getPlatformAbbrev(desc->platform);
-	}
-
-	if (desc->language != EN_ANY && desc->language != UNK_LANG && !(desc->flags & ADGF_DROPLANGUAGE)) {
-		res = res + "-" + getLanguageCode(desc->language);
-	}
-
-	return res;
-}
-
-static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc, const Common::ADParams &params) {
-	if (params.singleid != NULL) {
-		desc["preferredtarget"] = desc["gameid"];
-		desc["gameid"] = params.singleid;
-	}
-
-	if (!(params.flags & kADFlagDontAugmentPreferredTarget)) {
-		if (!desc.contains("preferredtarget"))
-			desc["preferredtarget"] = desc["gameid"];
-
-		desc["preferredtarget"] = generatePreferredTarget(desc["preferredtarget"], realDesc);
-	}
-
-	if (params.flags & kADFlagUseExtraAsHint)
-		desc["extra"] = realDesc->extra;
-}
-
-GameList AdvancedMetaEngine::detectGames(const FSList &fslist) const {
-	ADGameDescList matches = detectGame(fslist, params, Common::UNK_LANG, Common::kPlatformUnknown, "");
-	GameList detectedGames;
-
-	// Use fallback detector if there were no matches by other means
-	if (matches.empty()) {
-		const Common::ADGameDescription *fallbackDesc = fallbackDetect(fslist);
-		if (fallbackDesc != 0) {
-			GameDescriptor desc(toGameDescriptor(*fallbackDesc, params.list));
-			updateGameDescriptor(desc, fallbackDesc, params);
-			detectedGames.push_back(desc);
-		}
-	} else for (uint i = 0; i < matches.size(); i++) { // Otherwise use the found matches
-		GameDescriptor desc(toGameDescriptor(*matches[i], params.list));
-		updateGameDescriptor(desc, matches[i], params);
-		detectedGames.push_back(desc);
-	}
-
-	return detectedGames;
-}
-
-Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
-	assert(engine);
-	upgradeTargetIfNecessary(params);
-
-	const ADGameDescription *agdDesc = 0;
-	Common::Language language = Common::UNK_LANG;
-	Common::Platform platform = Common::kPlatformUnknown;
-	Common::String extra;
-
-	if (ConfMan.hasKey("language"))
-		language = Common::parseLanguage(ConfMan.get("language"));
-	if (ConfMan.hasKey("platform"))
-		platform = Common::parsePlatform(ConfMan.get("platform"));
-	if (params.flags & kADFlagUseExtraAsHint)
-		if (ConfMan.hasKey("extra"))
-			extra = ConfMan.get("extra");
-
-	Common::String gameid = ConfMan.get("gameid");
-
-	Common::String path;
-	if (ConfMan.hasKey("path")) {
-		path = ConfMan.get("path");
-	} else {
-		path = ".";
-		warning("No path was provided. Assuming the data files are in the current directory");
-	}
-	FSNode dir(path);
-	FSList files;
-	if (!dir.isDirectory() || !dir.getChildren(files, FSNode::kListAll)) {
-		warning("Game data path does not exist or is not a directory (%s)", path.c_str());
-		return kNoGameDataFoundError;
-	}
-
-	ADGameDescList matches = detectGame(files, params, language, platform, extra);
-
-	if (params.singleid == NULL) {
-		for (uint i = 0; i < matches.size(); i++) {
-			if (matches[i]->gameid == gameid) {
-				agdDesc = matches[i];
-				break;
-			}
-		}
-	} else if (matches.size() > 0) {
-		agdDesc = matches[0];
-	}
-
-	if (agdDesc == 0) {
-		// Use fallback detector if there were no matches by other means
-		agdDesc = fallbackDetect(files);
-		if (agdDesc != 0) {
-			// Seems we found a fallback match. But first perform a basic
-			// sanity check: the gameid must match.
-			if (params.singleid == NULL && agdDesc->gameid != gameid)
-				agdDesc = 0;
-		}
-	}
-
-	if (agdDesc == 0) {
-		return kNoGameDataFoundError;
-	}
-
-	debug(2, "Running %s", toGameDescriptor(*agdDesc, params.list).description().c_str());
-	if (!createInstance(syst, engine, agdDesc)) {
-		return kNoGameDataFoundError;
-	}
-	return kNoError;
-}
-
-struct SizeMD5 {
-	int size;
-	char md5[32+1];
-};
-
-typedef HashMap<String, SizeMD5, IgnoreCase_Hash, IgnoreCase_EqualTo> SizeMD5Map;
-typedef HashMap<String, FSNode, IgnoreCase_Hash, IgnoreCase_EqualTo> FileMap;
-
-static void reportUnknown(const SizeMD5Map &filesSizeMD5) {
-	// TODO: This message should be cleaned up / made more specific.
-	// For example, we should specify at least which engine triggered this.
-	//
-	// Might also be helpful to display the full path (for when this is used
-	// from the mass detector).
-	printf("Your game version appears to be unknown. Please, report the following\n");
-	printf("data to the ScummVM team along with name of the game you tried to add\n");
-	printf("and its version/language/etc.:\n");
-
-	for (SizeMD5Map::const_iterator file = filesSizeMD5.begin(); file != filesSizeMD5.end(); ++file)
-		printf("  \"%s\", \"%s\", %d\n", file->_key.c_str(), file->_value.md5, file->_value.size);
-
-	printf("\n");
-}
-
-static ADGameDescList detectGameFilebased(const FileMap &allFiles, const Common::ADParams &params);
-
-static ADGameDescList detectGame(const FSList &fslist, const Common::ADParams &params, Language language, Platform platform, const Common::String extra) {
-	FileMap allFiles;
-	SizeMD5Map filesSizeMD5;
-
-	const ADGameFileDescription *fileDesc;
-	const ADGameDescription *g;
-	const byte *descPtr;
-
-	debug(3, "Starting detection");
-
-	// First we compose a hashmap of all files in fslist.
-	// Includes nifty stuff like removing trailing dots and ignoring case.
-	for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
-		if (file->isDirectory())
-			continue;
-
-		String tstr = file->getName();
-
-		// Strip any trailing dot
-		if (tstr.lastChar() == '.')
-			tstr.deleteLastChar();
-
-		allFiles[tstr] = *file;	// Record the presence of this file
-	}
-
-	// Check which files are included in some ADGameDescription *and* present
-	// in fslist. Compute MD5s and file sizes for these files.
-	for (descPtr = params.descs; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += params.descItemSize) {
-		g = (const ADGameDescription *)descPtr;
-
-		for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
-			String fname = fileDesc->fileName;
-			if (allFiles.contains(fname) && !filesSizeMD5.contains(fname)) {
-				debug(3, "+ %s", fname.c_str());
-
-				SizeMD5 tmp;
-				if (!md5_file_string(allFiles[fname], tmp.md5, params.md5Bytes))
-					tmp.md5[0] = 0;
-
-				debug(3, "> '%s': '%s'", fname.c_str(), tmp.md5);
-
-				File testFile;
-				if (testFile.open(allFiles[fname]))
-					tmp.size = (int32)testFile.size();
-				else
-					tmp.size = -1;
-
-				filesSizeMD5[fname] = tmp;
-			}
-		}
-	}
-
-	ADGameDescList matched;
-	int maxFilesMatched = 0;
-
-	// MD5 based matching
-	uint i;
-	for (i = 0, descPtr = params.descs; ((const ADGameDescription *)descPtr)->gameid != 0; descPtr += params.descItemSize, ++i) {
-		g = (const ADGameDescription *)descPtr;
-		bool fileMissing = false;
-
-		// Do not even bother to look at entries which do not have matching
-		// language and platform (if specified).
-		if ((language != UNK_LANG && g->language != UNK_LANG && g->language != language) ||
-			(platform != kPlatformUnknown && g->platform != kPlatformUnknown && g->platform != platform)) {
-			continue;
-		}
-
-		if ((params.flags & kADFlagUseExtraAsHint) && !extra.empty() && g->extra != extra)
-			continue;
-
-		// Try to match all files for this game
-		for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
-			String tstr = fileDesc->fileName;
-
-			if (!filesSizeMD5.contains(tstr)) {
-				fileMissing = true;
-				break;
-			}
-
-			if (fileDesc->md5 != NULL && 0 != strcmp(fileDesc->md5, filesSizeMD5[tstr].md5)) {
-				debug(3, "MD5 Mismatch. Skipping (%s) (%s)", fileDesc->md5, filesSizeMD5[tstr].md5);
-				fileMissing = true;
-				break;
-			}
-
-			if (fileDesc->fileSize != -1 && fileDesc->fileSize != filesSizeMD5[tstr].size) {
-				debug(3, "Size Mismatch. Skipping");
-				fileMissing = true;
-				break;
-			}
-
-			debug(3, "Matched file: %s", tstr.c_str());
-		}
-		if (!fileMissing) {
-			debug(2, "Found game: %s (%s %s/%s) (%d)", g->gameid, g->extra,
-			 getPlatformDescription(g->platform), getLanguageDescription(g->language), i);
-
-			// Count the number of matching files. Then, only keep those
-			// entries which match a maximal amount of files.
-			int curFilesMatched = 0;
-			for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++)
-				curFilesMatched++;
-
-			if (curFilesMatched > maxFilesMatched) {
-				debug(2, " ... new best match, removing all previous candidates");
-				maxFilesMatched = curFilesMatched;
-
-				for (uint j = 0; j < matched.size();) {
-					if (matched[j]->flags & ADGF_KEEPMATCH)
-						 ++j;
-					else
-						matched.remove_at(j);
-				}
-				matched.push_back(g);
-			} else if (curFilesMatched == maxFilesMatched) {
-				matched.push_back(g);
-			} else {
-				debug(2, " ... skipped");
-			}
-
-		} else {
-			debug(5, "Skipping game: %s (%s %s/%s) (%d)", g->gameid, g->extra,
-			 getPlatformDescription(g->platform), getLanguageDescription(g->language), i);
-		}
-	}
-
-	// We didn't find a match
-	if (matched.empty()) {
-		if (!filesSizeMD5.empty())
-			reportUnknown(filesSizeMD5);
-
-		// Filename based fallback
-		if (params.fileBasedFallback != 0)
-			matched = detectGameFilebased(allFiles, params);
-	}
-
-	return matched;
-}
-
-/**
- * Check for each ADFileBasedFallback record whether all files listed
- * in it are present. If multiple pass this test, we pick the one with
- * the maximal number of matching files. In case of a tie, the entry
- * coming first in the list is chosen.
- */
-static ADGameDescList detectGameFilebased(const FileMap &allFiles, const Common::ADParams &params) {
-	const ADFileBasedFallback *ptr;
-	const char* const* filenames;
-
-	int maxNumMatchedFiles = 0;
-	const ADGameDescription *matchedDesc = 0;
-
-	for (ptr = params.fileBasedFallback; ptr->desc; ++ptr) {
-		const ADGameDescription *agdesc = (const ADGameDescription *)ptr->desc;
-		int numMatchedFiles = 0;
-		bool fileMissing = false;
-
-		for (filenames = ptr->filenames; *filenames; ++filenames) {
-			debug(3, "++ %s", *filenames);
-			if (!allFiles.contains(*filenames)) {
-				fileMissing = true;
-				break;
-			}
-
-			numMatchedFiles++;
-		}
-
-		if (!fileMissing) {
-			debug(4, "Matched: %s", agdesc->gameid);
-
-			if (numMatchedFiles > maxNumMatchedFiles) {
-				matchedDesc = agdesc;
-				maxNumMatchedFiles = numMatchedFiles;
-
-				debug(4, "and overriden");
-			}
-		}
-	}
-
-	ADGameDescList matched;
-
-	if (matchedDesc) { // We got a match
-		matched.push_back(matchedDesc);
-		if (params.flags & kADFlagPrintWarningOnFileBasedFallback) {
-			printf("Your game version has been detected using filename matching as a\n");
-			printf("variant of %s.\n", matchedDesc->gameid);
-			printf("If this is an original and unmodified version, please report any\n");
-			printf("information previously printed by ScummVM to the team.\n");
-		}
-	}
-
-	return matched;
-}
-
-GameList AdvancedMetaEngine::getSupportedGames() const {
-	return gameIDList(params);
-}
-GameDescriptor AdvancedMetaEngine::findGame(const char *gameid) const {
-	return AdvancedDetector::findGameID(gameid, params.list, params.obsoleteList);
-}
-
-}	// End of namespace Common
diff --git a/common/advancedDetector.h b/common/advancedDetector.h
deleted file mode 100644
index 522fd7b117..0000000000
--- a/common/advancedDetector.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-#ifndef COMMON_ADVANCED_DETECTOR_H
-#define COMMON_ADVANCED_DETECTOR_H
-
-#include "common/fs.h"
-#include "common/error.h"
-
-#include "engines/metaengine.h"
-
-namespace Common {
-
-struct ADGameFileDescription {
-	const char *fileName;
-	uint16 fileType; // Optional. Not used during detection, only by engines.
-	const char *md5; // Optional. May be NULL.
-	int32 fileSize;  // Optional. Set to -1 to ignore.
-};
-
-#define AD_ENTRY1(f, x) {{ f, 0, x, -1}, {NULL, 0, NULL, 0}}
-#define AD_ENTRY1s(f, x, s) {{ f, 0, x, s}, {NULL, 0, NULL, 0}}
-
-enum ADGameFlags {
-	ADGF_NO_FLAGS = 0,
-	ADGF_KEEPMATCH = (1 << 27), // this entry is kept even when there are matched
-								// entries with more files
-	ADGF_DROPLANGUAGE = (1 << 28), // don't add language to gameid
-	ADGF_CD = (1 << 29),    // add "-cd" to gameid
-	ADGF_DEMO = (1 << 30)   // add "-demo" to gameid
-};
-
-struct ADGameDescription {
-	const char *gameid;
-	const char *extra;
-	ADGameFileDescription filesDescriptions[14];
-	Language language;
-	Platform platform;
-
-	/**
-	 * A bitmask of extra flags. The top 8 bits are reserved for generic flags
-	 * defined in the ADGameFlags. This leaves 24 flags to be used by client
-	 * code.
-	 */
-	uint32 flags;
-};
-
-/**
- * End marker for a table of ADGameDescription structs. Use this to
- * terminate a list to be passed to the AdvancedDetector API.
- */
-#define AD_TABLE_END_MARKER	\
-	{ NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, Common::ADGF_NO_FLAGS }
-
-
-struct ADObsoleteGameID {
-	const char *from;
-	const char *to;
-	Common::Platform platform;
-};
-
-struct ADFileBasedFallback {
-	/**
-	 * Pointer to an ADGameDescription or subclass thereof which will get
-	 * returned if there's a detection match.
-	 */
-	const void *desc;
-
-	/**
-	 * A zero-terminated list of filenames used for matching. All files in
-	 * the list must be present to get a detection match.
-	 */
-	const char *filenames[10];
-};
-
-
-enum ADFlags {
-	/**
-	 * Generate/augment preferred target with information on the language (if
-	 * not equal to english) and platform (if not equal to PC).
-	 */
-	kADFlagDontAugmentPreferredTarget = (1 << 0),
-	kADFlagPrintWarningOnFileBasedFallback = (1 << 1),
-	kADFlagUseExtraAsHint = (1 << 2)
-};
-
-/**
- * A structure containing all parameters for the AdvancedDetector.
- * Typically, an engine will have a single instance of this which is
- * used by its AdvancedMetaEngine subclass as a parameter to the
- * primary AdvancedMetaEngine constructor.
- */
-struct ADParams {
-	/**
-	 * Pointer to an array of objects which are either ADGameDescription
-	 * or superset structures (i.e. start with an ADGameDescription member.
-	 * The list is terminated by an entry with a gameid equal to 0
-	 * (see AD_TABLE_END_MARKER).
-	 */
-	const byte *descs;
-
-	/**
-	 * The size of a single entry of the above descs array. Always
-	 * must be >= sizeof(ADGameDescription).
-	 */
-	uint descItemSize;
-
-	/**
-	 * The number of bytes to compute MD5 sum for. The AdvancedDetector
-	 * is primarily based on computing and matching MD5 checksums of files.
-	 * Since doing that for large files can be slow, it can be restricted
-	 * to a subset of all files.
-	 * Typically this will be set to something between 5 and 50 kilobyte,
-	 * but arbitrary non-zero values are possible.
-	 */
-	uint md5Bytes;
-
-	/**
-	 * A list of all gameids (and their corresponding descriptions) supported
-	 * by this engine.
-	 */
-	const PlainGameDescriptor *list;
-
-	/**
-	 * Structure for autoupgrading obsolete targets (optional).
-	 *
-	 * @todo Properly explain this.
-	 */
-	const Common::ADObsoleteGameID *obsoleteList;
-
-	/**
-	 * Name of single gameid (optional).
-	 *
-	 * @todo Properly explain this -- what does it do?
-	 */
-	const char *singleid;
-
-	/**
-	 * List of files for file-based fallback detection (optional).
-	 * This is used if the regular MD5 based detection failed to
-	 * detect anything.
-	 * As usual this list is terminated by an all-zero entry.
-	 *
-	 * @todo Properly explain this
-	 */
-	const ADFileBasedFallback *fileBasedFallback;
-
-	/**
-	 * A bitmask of flags which can be used to configure the behavior
-	 * of the AdvancedDetector. Refer to ADFlags for a list of flags
-	 * that can be ORed together and passed here.
-	 */
-	uint32 flags;
-};
-
-
-namespace AdvancedDetector {
-
-/**
- * Scan through the game descriptors specified in params and search for
- * 'gameid' in there. If a match is found, returns a GameDescriptor
- * with gameid and description set.
- */
-GameDescriptor findGameID(
-	const char *gameid,
-	const PlainGameDescriptor *list,
-	const Common::ADObsoleteGameID *obsoleteList = 0
-	);
-
-} // End of namespace AdvancedDetector
-
-/**
- * A MetaEngine implementation based around the advanced detector code.
- */
-class AdvancedMetaEngine : public MetaEngine {
-	const Common::ADParams &params;
-public:
-	AdvancedMetaEngine(const Common::ADParams &dp) : params(dp) {}
-
-	virtual GameList getSupportedGames() const;
-	virtual GameDescriptor findGame(const char *gameid) const;
-	virtual GameList detectGames(const FSList &fslist) const;
-	virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
-
-	// To be provided by subclasses
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const = 0;
-
-	/**
-	 * An (optional) generic fallback detect function which is invoked
-	 * if both the regular MD5 based detection as well as the file
-	 * based fallback failed to detect anything.
-	 */
-	virtual const Common::ADGameDescription *fallbackDetect(const FSList &fslist) const {
-		return 0;
-	}
-};
-
-}	// End of namespace Common
-
-#endif
diff --git a/common/module.mk b/common/module.mk
index e04af5270b..6d8a71cd23 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -1,7 +1,6 @@
 MODULE := common
 
 MODULE_OBJS := \
-	advancedDetector.o \
 	archive.o \
 	config-file.o \
 	config-manager.o \