diff options
Diffstat (limited to 'engines')
31 files changed, 1380 insertions, 648 deletions
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp new file mode 100644 index 0000000000..e2886074a7 --- /dev/null +++ b/engines/advancedDetector.cpp @@ -0,0 +1,515 @@ +/* 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 "engines/advancedDetector.h" +#include "common/config-manager.h" + +/** + * A list of pointers to ADGameDescription structs (or subclasses thereof). + */ +typedef Common::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 Common::FSList &fslist, const ADParams ¶ms, Common::Language language, Common::Platform platform, const Common::String extra); + + +/** + * Returns list of targets supported by the engine. + * Distinguishes engines with single ID + */ +static GameList gameIDList(const ADParams ¶ms) { + 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 ADParams ¶ms) { + if (params.obsoleteList == 0) + return; + + Common::String gameid = ConfMan.get("gameid"); + + for (const 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 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 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 Common::String generatePreferredTarget(const Common::String &id, const ADGameDescription *desc) { + Common::String res(id); + + if (desc->flags & ADGF_DEMO) { + res = res + "-demo"; + } + + if (desc->flags & ADGF_CD) { + res = res + "-cd"; + } + + if (desc->platform != Common::kPlatformPC && desc->platform != Common::kPlatformUnknown) { + res = res + "-" + getPlatformAbbrev(desc->platform); + } + + if (desc->language != Common::EN_ANY && desc->language != Common::UNK_LANG && !(desc->flags & ADGF_DROPLANGUAGE)) { + res = res + "-" + getLanguageCode(desc->language); + } + + return res; +} + +static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc, const ADParams ¶ms) { + 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 Common::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 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"); + } + Common::FSNode dir(path); + Common::FSList files; + if (!dir.isDirectory() || !dir.getChildren(files, Common::FSNode::kListAll)) { + warning("Game data path does not exist or is not a directory (%s)", path.c_str()); + return Common::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 Common::kNoGameDataFoundError; + } + + debug(2, "Running %s", toGameDescriptor(*agdDesc, params.list).description().c_str()); + if (!createInstance(syst, engine, agdDesc)) { + return Common::kNoGameDataFoundError; + } + return Common::kNoError; +} + +struct SizeMD5 { + int size; + char md5[32+1]; +}; + +typedef Common::HashMap<Common::String, SizeMD5, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> SizeMD5Map; +typedef Common::HashMap<Common::String, Common::FSNode, Common::IgnoreCase_Hash, Common::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 ADParams ¶ms); + +static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams ¶ms, Common::Language language, Common::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 (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { + if (file->isDirectory()) + continue; + + Common::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++) { + Common::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); + + Common::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 != Common::UNK_LANG && g->language != Common::UNK_LANG && g->language != language) || + (platform != Common::kPlatformUnknown && g->platform != Common::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++) { + Common::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 ADParams ¶ms) { + 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); +} diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h new file mode 100644 index 0000000000..a33b385d46 --- /dev/null +++ b/engines/advancedDetector.h @@ -0,0 +1,218 @@ +/* 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 ENGINES_ADVANCED_DETECTOR_H +#define ENGINES_ADVANCED_DETECTOR_H + +#include "common/fs.h" +#include "common/error.h" + +#include "engines/metaengine.h" + + +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]; + Common::Language language; + Common::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, 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 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 ADObsoleteGameID *obsoleteList = 0 + ); + +} // End of namespace AdvancedDetector + +/** + * A MetaEngine implementation based around the advanced detector code. + */ +class AdvancedMetaEngine : public MetaEngine { + const ADParams ¶ms; +public: + AdvancedMetaEngine(const ADParams &dp) : params(dp) {} + + virtual GameList getSupportedGames() const; + virtual GameDescriptor findGame(const char *gameid) const; + virtual GameList detectGames(const Common::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 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 ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { + return 0; + } +}; + +#endif diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 9cb55e029d..4b59b39c32 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/config-manager.h" #include "common/file.h" #include "graphics/thumbnail.h" @@ -38,7 +38,7 @@ namespace Agi { struct AGIGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameID; int gameType; @@ -114,7 +114,7 @@ namespace Agi { AD_ENTRY1s(fname,md5,size), \ lang, \ platform, \ - Common::ADGF_NO_FLAGS \ + ADGF_NO_FLAGS \ }, \ gid, \ interp, \ @@ -237,7 +237,7 @@ static const AGIGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_GOLDRUSH, GType_V3, @@ -484,7 +484,7 @@ static const AGIGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_SQ2, GType_V2, @@ -612,7 +612,7 @@ static const AGIGameDescription gameDescriptions[] = { AD_ENTRY1("logdir", "421da3a18004122a966d64ab6bd86d2e"), Common::RU_RUS, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_FANMADE, GType_V2, @@ -628,7 +628,7 @@ static const AGIGameDescription gameDescriptions[] = { AD_ENTRY1("logdir", "aaea5b4a348acb669d13b0e6f22d4dc9"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_GETOUTTASQ, GType_V2, @@ -787,7 +787,7 @@ static AGIGameDescription g_fallbackDesc = { AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor Common::UNK_LANG, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_FANMADE, GType_V2, @@ -795,7 +795,7 @@ static AGIGameDescription g_fallbackDesc = { 0x2917, }; -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Agi::gameDescriptions, // Size of that superset structure @@ -818,12 +818,12 @@ static const Common::ADParams detectionParams = { using namespace Agi; -class AgiMetaEngine : public Common::AdvancedMetaEngine { +class AgiMetaEngine : public AdvancedMetaEngine { mutable Common::String _gameid; mutable Common::String _extra; public: - AgiMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + AgiMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "AGI preAGI + v2 + v3 Engine"; @@ -833,13 +833,13 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; - const Common::ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; + const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; }; bool AgiMetaEngine::hasFeature(MetaEngineFeature f) const { @@ -860,7 +860,7 @@ bool AgiBase::hasFeature(EngineFeature f) const { } -bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Agi::AGIGameDescription *gd = (const Agi::AGIGameDescription *)desc; bool res = true; @@ -977,7 +977,7 @@ SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int sl return SaveStateDescriptor(); } -const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSList &fslist) const { +const ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSList &fslist) const { typedef Common::HashMap<Common::String, int32> IntMap; IntMap allFiles; bool matchedUsingFilenames = false; @@ -994,7 +994,7 @@ const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSL // Set the default values for the fallback descriptor's ADGameDescription part. g_fallbackDesc.desc.language = Common::UNK_LANG; g_fallbackDesc.desc.platform = Common::kPlatformPC; - g_fallbackDesc.desc.flags = Common::ADGF_NO_FLAGS; + g_fallbackDesc.desc.flags = ADGF_NO_FLAGS; // Set default values for the fallback descriptor's AGIGameDescription part. g_fallbackDesc.gameID = GID_FANMADE; @@ -1135,7 +1135,7 @@ const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSL printf("If this is an original and unmodified version or new made Fanmade game,\n"); printf("please report any, information previously printed by ScummVM to the team.\n"); - return (const Common::ADGameDescription *)&g_fallbackDesc; + return (const ADGameDescription *)&g_fallbackDesc; } return 0; diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 4c400859f6..12aeb7fc61 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" @@ -35,7 +35,7 @@ namespace AGOS { struct AGOSGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameType; int gameId; @@ -49,7 +49,7 @@ struct AGOSGameDescription { * corresponding new target and platform combination. * */ -static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = { +static const ADObsoleteGameID obsoleteGameIDsTable[] = { {"simon1acorn", "simon1", Common::kPlatformAcorn}, {"simon1amiga", "simon1", Common::kPlatformAmiga}, {"simon1cd32", "simon1", Common::kPlatformAmiga}, @@ -80,7 +80,7 @@ static const PlainGameDescriptor simonGames[] = { #include "agos/detection_tables.h" -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)AGOS::gameDescriptions, // Size of that superset structure @@ -99,9 +99,9 @@ static const Common::ADParams detectionParams = { 0 }; -class AgosMetaEngine : public Common::AdvancedMetaEngine { +class AgosMetaEngine : public AdvancedMetaEngine { public: - AgosMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + AgosMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "AGOS"; @@ -112,7 +112,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; }; @@ -127,7 +127,7 @@ bool AGOS::AGOSEngine::hasFeature(EngineFeature f) const { (f == kSupportsRTL); } -bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const AGOS::AGOSGameDescription *gd = (const AGOS::AGOSGameDescription *)desc; bool res = true; diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index dddc8a7aa6..19a307fc71 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -40,7 +40,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, GType_ELVIRA1, @@ -60,7 +60,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -80,7 +80,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -100,7 +100,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -122,7 +122,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAtariST, - Common::ADGF_DEMO + ADGF_DEMO }, GType_ELVIRA1, @@ -144,7 +144,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -166,7 +166,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -188,7 +188,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -210,7 +210,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -232,7 +232,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -254,7 +254,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA1, @@ -279,7 +279,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -304,7 +304,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -329,7 +329,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -354,7 +354,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -379,7 +379,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -404,7 +404,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -429,7 +429,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -455,7 +455,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -480,7 +480,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -505,7 +505,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -530,7 +530,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -555,7 +555,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -580,7 +580,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -605,7 +605,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -630,7 +630,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_ELVIRA2, @@ -656,7 +656,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_WW, @@ -682,7 +682,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_WW, @@ -704,7 +704,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_WW, @@ -732,7 +732,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_WW, @@ -760,7 +760,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_WW, @@ -783,7 +783,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAcorn, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -807,7 +807,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAcorn, - Common::ADGF_DEMO + ADGF_DEMO }, GType_SIMON1, @@ -831,7 +831,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAcorn, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -854,7 +854,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -877,7 +877,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, GType_SIMON1, @@ -900,7 +900,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -923,7 +923,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -946,7 +946,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -969,7 +969,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -992,7 +992,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1015,7 +1015,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1038,7 +1038,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_SIMON1, @@ -1061,7 +1061,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1084,7 +1084,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::CZ_CZE, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1107,7 +1107,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::RU_RUS, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1130,7 +1130,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1153,7 +1153,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::CZ_CZE, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1176,7 +1176,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::RU_RUS, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1199,7 +1199,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1222,7 +1222,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1245,7 +1245,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1268,7 +1268,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1292,7 +1292,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_SIMON1, @@ -1316,7 +1316,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1340,7 +1340,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1364,7 +1364,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::RU_RUS, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1388,7 +1388,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1412,7 +1412,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1436,7 +1436,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::HB_ISR, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1460,7 +1460,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1485,7 +1485,7 @@ static const AGOSGameDescription gameDescriptions[] = { // FIXME: DOS version which uses WAV format Common::IT_ITA, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1509,7 +1509,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1533,7 +1533,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1557,7 +1557,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON1, @@ -1581,7 +1581,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1605,7 +1605,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::RU_RUS, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1629,7 +1629,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1653,7 +1653,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1677,7 +1677,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_SIMON2, @@ -1701,7 +1701,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_SIMON2, @@ -1725,7 +1725,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1749,7 +1749,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1773,7 +1773,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1797,7 +1797,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1821,7 +1821,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1845,7 +1845,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::HB_ISR, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1870,7 +1870,7 @@ static const AGOSGameDescription gameDescriptions[] = { // FIXME: DOS version which uses WAV format Common::IT_ITA, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1894,7 +1894,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1918,7 +1918,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::CZ_CZE, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1942,7 +1942,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1966,7 +1966,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -1990,7 +1990,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -2014,7 +2014,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::PL_POL, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_SIMON2, @@ -2037,7 +2037,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2060,7 +2060,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2083,7 +2083,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2106,7 +2106,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2129,7 +2129,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2152,7 +2152,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2174,7 +2174,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2196,7 +2196,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::PL_POL, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2218,7 +2218,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2240,7 +2240,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2262,7 +2262,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2284,7 +2284,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2306,7 +2306,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FF, @@ -2326,7 +2326,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_PP, @@ -2346,7 +2346,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_PP, @@ -2366,7 +2366,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_PP, @@ -2386,7 +2386,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_PP, @@ -2406,7 +2406,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_PP, @@ -2426,7 +2426,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformWindows, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_PP, diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index d7351879ba..ab9d7e4685 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -27,7 +27,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/system.h" #include "cine/cine.h" @@ -36,7 +36,7 @@ namespace Cine { struct CINEGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameType; uint32 features; @@ -56,7 +56,7 @@ static const PlainGameDescriptor cineGames[] = { {0, 0} }; -static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = { +static const ADObsoleteGameID obsoleteGameIDsTable[] = { {"fw", "cine", Common::kPlatformUnknown}, {"os", "cine", Common::kPlatformUnknown}, {0, 0, Common::kPlatformUnknown} @@ -72,7 +72,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "61d003202d301c29dd399acfb1354310"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -91,7 +91,7 @@ static const CINEGameDescription gameDescriptions[] = { }, Common::EN_USA, Common::kPlatformPC, - Common::ADGF_CD + ADGF_CD }, GType_FW, GF_CD | GF_CRYPTED_BOOT_PRC, @@ -105,7 +105,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "91d7271155520eae6915a9dd2dac120c"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -118,7 +118,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "f5e98fcca3fb5e7afa284c81c39d8b14"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, GF_ALT_FONT, @@ -131,7 +131,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "570109f965c7f53984b98c83d86eb206"), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, GF_ALT_FONT, @@ -144,7 +144,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "5d1acb97abe9591f9008e00d07add95a"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -157,7 +157,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "57afd280b598b4180fda6689fbedc4b8"), Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -170,7 +170,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "3a87a913e0e33963a48a7f822ca0eb0e"), Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, GF_ALT_FONT, @@ -183,7 +183,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "5ad0007ccd5f7b3dd6b15ea7f281f9e1"), Common::ES_ESP, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -196,7 +196,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "460f2da8793bc581a2d4b6fc19ccb5ae"), Common::FR_FRA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -209,7 +209,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "1c8e5207743172134409ac58860021af"), Common::IT_ITA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -226,7 +226,7 @@ static const CINEGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, GType_FW, 0, @@ -239,7 +239,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "36050db13af57e462ca1adc4df99de4e"), Common::EN_ANY, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -252,7 +252,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("part01", "ef245573b7dab0d4825ceb98e37cef4d"), Common::FR_FRA, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_FW, 0, @@ -265,7 +265,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs00", "d6752e7d25924cb866b61eb7cb0c8b56"), Common::EN_GRB, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -280,7 +280,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs1", "9629129b86979fa592c1787385bf3695"), Common::EN_GRB, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -293,7 +293,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs1", "d8c3a9d05a63e4cfa801826a7063a126"), Common::EN_USA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -306,7 +306,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs00", "862a75d76fb7fffec30e52be9ad1c474"), Common::EN_USA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, GF_CD, @@ -319,7 +319,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs1", "39b91ae35d1297ce0a76a1a803ca1593"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -332,7 +332,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs1", "74c2dabd9d212525fca8875a5f6d8994"), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -349,7 +349,7 @@ static const CINEGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, GF_CD, @@ -362,7 +362,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs00", "f143567f08cfd1a9b1c9a41c89eadfef"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -375,7 +375,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs1", "da066e6b8dd93f2502c2a3755f08dc12"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -388,7 +388,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "a9da5531ead0ebf9ad387fa588c0cbb0"), Common::EN_GRB, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -401,7 +401,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "8a429ced2f4acff8a15ae125174042e8"), Common::EN_GRB, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -414,7 +414,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "d5f27e33fc29c879f36f15b86ccfa58c"), Common::EN_USA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -427,7 +427,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "8b7dce249821d3a62b314399c4334347"), Common::DE_DEU, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -440,7 +440,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "35fc295ddd0af9da932d256ba799a4b0"), Common::ES_ESP, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -453,7 +453,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "d4ea4a97e01fa67ea066f9e785050ed2"), Common::FR_FRA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -466,7 +466,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("demo", "8d3a750d1c840b1b1071e42f9e6f6aa2"), Common::EN_GRB, Common::kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, GType_OS, GF_DEMO, @@ -479,7 +479,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "1501d5ae364b2814a33ed19347c3fcae"), Common::EN_GRB, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -492,7 +492,7 @@ static const CINEGameDescription gameDescriptions[] = { AD_ENTRY1("procs0", "2148d25de3219dd4a36580ca735d0afa"), Common::FR_FRA, Common::kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_OS, 0, @@ -503,7 +503,7 @@ static const CINEGameDescription gameDescriptions[] = { } // End of namespace Cine -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Cine::gameDescriptions, // Size of that superset structure @@ -522,9 +522,9 @@ static const Common::ADParams detectionParams = { 0 }; -class CineMetaEngine : public Common::AdvancedMetaEngine { +class CineMetaEngine : public AdvancedMetaEngine { public: - CineMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + CineMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Cinematique evo 1 engine"; @@ -534,7 +534,7 @@ public: return "Future Wars & Operation Stealth (C) Delphine Software"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; @@ -555,7 +555,7 @@ bool Cine::CineEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool CineMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool CineMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Cine::CINEGameDescription *gd = (const Cine::CINEGameDescription *)desc; if (gd) { *engine = new Cine::CineEngine(syst, gd); diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index c8aefedbd1..e38cec0551 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -27,14 +27,14 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "cruise/cruise.h" namespace Cruise { struct CRUISEGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameType; uint32 features; @@ -61,7 +61,7 @@ static const PlainGameDescriptor cruiseGames[] = { {0, 0} }; -static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = { +static const ADObsoleteGameID obsoleteGameIDsTable[] = { {"cruise", "cruise", Common::kPlatformUnknown}, {0, 0, Common::kPlatformUnknown} }; @@ -76,7 +76,7 @@ static const CRUISEGameDescription gameDescriptions[] = { AD_ENTRY1("D1", "41a7a4d426dbd048eb369cfee4bb2717"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_CRUISE, 0, @@ -88,7 +88,7 @@ static const CRUISEGameDescription gameDescriptions[] = { AD_ENTRY1("D1", "a90d2b9ead6b4d812cd14268672cf178"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_CRUISE, 0, @@ -100,7 +100,7 @@ static const CRUISEGameDescription gameDescriptions[] = { AD_ENTRY1("D1", "e258865807ea31b2d523340e6f0a606b"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_CRUISE, 0, @@ -112,7 +112,7 @@ static const CRUISEGameDescription gameDescriptions[] = { AD_ENTRY1("D1", "f2a26522d49983c4ae32bcccbb801b02"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_CRUISE, 0, @@ -124,7 +124,7 @@ static const CRUISEGameDescription gameDescriptions[] = { AD_ENTRY1("D1", "e19a4ab2e24a69087e4ea994a5506231"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_CRUISE, 0, @@ -136,7 +136,7 @@ static const CRUISEGameDescription gameDescriptions[] = { AD_ENTRY1("D1", "9a302ada55600d96061fda1d63a6ccda"), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_CRUISE, 0, @@ -146,7 +146,7 @@ static const CRUISEGameDescription gameDescriptions[] = { } -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Cruise::gameDescriptions, // Size of that superset structure @@ -165,9 +165,9 @@ static const Common::ADParams detectionParams = { 0 }; -class CruiseMetaEngine : public Common::AdvancedMetaEngine { +class CruiseMetaEngine : public AdvancedMetaEngine { public: - CruiseMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + CruiseMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Cinematique evo 2 engine"; @@ -177,10 +177,10 @@ public: return "Cruise for a Corpse (C) Delphine Software"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; }; -bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Cruise::CRUISEGameDescription *gd = (const Cruise::CRUISEGameDescription *)desc; if (gd) { *engine = new Cruise::CruiseEngine(syst, gd); diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 81c8d9a62a..6040200662 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/file.h" #include "drascula/drascula.h" @@ -34,7 +34,7 @@ namespace Drascula { struct DrasculaGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; }; uint32 DrasculaEngine::getFeatures() const { @@ -46,7 +46,7 @@ Common::Language DrasculaEngine::getLanguage() const { } void DrasculaEngine::loadArchives() { - const Common::ADGameFileDescription *ag; + const ADGameFileDescription *ag; if (getFeatures() & GF_PACKED) { for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) @@ -76,7 +76,7 @@ static const DrasculaGameDescription gameDescriptions[] = { AD_ENTRY1s("14.ald", "09b2735953edcd43af115c65ae00b10e", 1595), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, }, @@ -88,7 +88,7 @@ static const DrasculaGameDescription gameDescriptions[] = { AD_ENTRY1s("packet.001", "c6a8697396e213a18472542d5f547cb4", 32847563), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_KEEPMATCH | GF_PACKED + ADGF_KEEPMATCH | GF_PACKED }, }, @@ -144,7 +144,7 @@ static const DrasculaGameDescription gameDescriptions[] = { AD_ENTRY1s("14.ald", "0746ed1a5cc8d9728f790c29813f4b43", 23059), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, }, @@ -156,7 +156,7 @@ static const DrasculaGameDescription gameDescriptions[] = { AD_ENTRY1s("14.ald", "72e46089033d56bad1c179ac36e2a9d2", 610), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, }, @@ -168,7 +168,7 @@ static const DrasculaGameDescription gameDescriptions[] = { AD_ENTRY1s("14.ald", "eeeee96b82169003630e08992248296c", 608), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, }, @@ -191,7 +191,7 @@ static const DrasculaGameDescription gameDescriptions[] = { AD_ENTRY1s("14.ald", "02b49a18328d0bf2efe6ba658c9c7a1d", 2098), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, }, @@ -232,7 +232,7 @@ static const DrasculaGameDescription gameDescriptions[] = { } // End of namespace Drascula -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Drascula::gameDescriptions, // Size of that superset structure @@ -251,9 +251,9 @@ static const Common::ADParams detectionParams = { 0 }; -class DrasculaMetaEngine : public Common::AdvancedMetaEngine { +class DrasculaMetaEngine : public AdvancedMetaEngine { public: - DrasculaMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + DrasculaMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Drascula Engine"; @@ -263,10 +263,10 @@ public: return "Drascula Engine (C) 2000 Alcachofa Soft, 1996 (C) Digital Dreams Multimedia, 1994 (C) Emilio de Paz"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; }; -bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Drascula::DrasculaGameDescription *gd = (const Drascula::DrasculaGameDescription *)desc; if (gd) { *engine = new Drascula::DrasculaEngine(syst, gd); diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index ba1f2f4c09..158e71c81c 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -24,14 +24,14 @@ */ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "gob/gob.h" namespace Gob { struct GOBGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; GameType gameType; int32 features; @@ -77,7 +77,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "c65e9cc8ba23a38456242e1f2b1caad4"), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesEGA, @@ -90,7 +90,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "f9233283a0be2464248d83e14b95f09c"), RU_RUS, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesEGA, @@ -103,7 +103,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "26a9118c0770fa5ac93a9626761600b2"), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesNone, @@ -116,7 +116,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesAdlib, @@ -129,7 +129,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -142,7 +142,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -155,7 +155,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -168,7 +168,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -181,7 +181,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -194,7 +194,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -207,7 +207,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -220,7 +220,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -233,7 +233,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -246,7 +246,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -259,7 +259,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "972f22c6ff8144a6636423f0354ca549"), UNK_LANG, kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob1, kFeaturesNone, @@ -272,7 +272,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "e72bd1e3828c7dec4c8a3e58c48bdfdb"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob1, kFeaturesNone, @@ -285,7 +285,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "a796096280d5efd48cf8e7dfbe426eb5", 193595), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob1, kFeaturesNone, @@ -298,7 +298,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6d837c6380d8f4d984c9f6cc0026df4f", 192712), EN_ANY, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesNone, @@ -311,7 +311,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"), EN_ANY, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesAdlib, @@ -324,7 +324,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"), DE_DEU, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesAdlib, @@ -337,7 +337,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"), FR_FRA, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesAdlib, @@ -350,7 +350,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"), IT_ITA, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesAdlib, @@ -363,7 +363,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"), ES_ESP, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesAdlib, @@ -376,7 +376,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -393,7 +393,7 @@ static const GOBGameDescription gameDescriptions[] = { }, FR_FRA, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -406,7 +406,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "5f53c56e3aa2f1e76c2e4f0caa15887f", 829232), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -419,7 +419,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "b45b984ee8017efd6ea965b9becd4d66"), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -436,7 +436,7 @@ static const GOBGameDescription gameDescriptions[] = { }, UNK_LANG, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -449,7 +449,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "dedb5d31d8c8050a8cf77abedcc53dae"), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -462,7 +462,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "25a99827cd59751a80bed9620fb677a0", 893302), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -475,7 +475,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "a13892cdf4badda85a6f6fb47603a128"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -488,7 +488,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "cd3e1df8b273636ee32e34b7064f50e8"), RU_RUS, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -501,7 +501,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "eebf2810122cfd17399260cd1468e994", 554014), EN_ANY, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesNone, @@ -514,7 +514,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "d28b9e9b41f31acfa58dcd12406c7b2c"), DE_DEU, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesNone, @@ -527,7 +527,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "3e4e7db0d201587dd2df4003b2993ef6"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -540,7 +540,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "4b13c02d1069b86bcfec80f4e474b98b", 554680), FR_FRA, kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesNone, @@ -553,7 +553,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "9de5fbb41cf97182109e5fecc9d90347"), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -566,7 +566,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"), EN_ANY, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -579,7 +579,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -592,7 +592,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -605,7 +605,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -618,7 +618,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -631,7 +631,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8b1c98ff2ab2e14f47a1b891e9b92217"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob2, kFeaturesAdlib, @@ -644,7 +644,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "cf1c95b2939bd8ff58a25c756cb6125e"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob2, kFeaturesAdlib, @@ -657,7 +657,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "4b278c2678ea01383fd5ca114d947eea"), UNK_LANG, kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob2, kFeaturesNone, @@ -670,7 +670,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "9fa85aea959fa8c582085855fbd99346", 553063), UNK_LANG, kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob2, kFeaturesNone, @@ -683,7 +683,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2bb8878a8042244dd2b96ff682381baa"), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesAdlib, @@ -696,7 +696,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "de92e5c6a8c163007ffceebef6e67f7d", 7117568), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesAdlib, @@ -709,7 +709,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6d60f9205ecfbd8735da2ee7823a70dc", 7014426), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesAdlib, @@ -726,7 +726,7 @@ static const GOBGameDescription gameDescriptions[] = { }, EN_GRB, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesNone, @@ -743,7 +743,7 @@ static const GOBGameDescription gameDescriptions[] = { }, EN_GRB, kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesNone, @@ -756,7 +756,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "af83debf2cbea21faa591c7b4608fe92", 458192), DE_DEU, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesNone, @@ -769,7 +769,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "257fe669705ac4971efdfd5656eef16a", 457719), FR_FRA, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesNone, @@ -782,7 +782,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "dffd1ab98fe76150d6933329ca6f4cc4", 459458), FR_FRA, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesNone, @@ -795,7 +795,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "e6d13fb3b858cb4f78a8780d184d5b2c"), FR_FRA, kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesNone, @@ -808,7 +808,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "4b10525a3782aa7ecd9d833b5c1d308b"), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesAdlib, @@ -821,7 +821,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "63170e71f04faba88673b3f510f9c4c8"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesAdlib, @@ -834,7 +834,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "8b57cd510da8a3bbd99e3a0297a8ebd1", 7018771), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWeen, kFeaturesAdlib, @@ -847,7 +847,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "2e9c2898f6bf206ede801e3b2e7ee428"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeWeen, kFeaturesAdlib, @@ -860,7 +860,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "15fb91a1b9b09684b28ac75edf66e504"), EN_USA, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeWeen, kFeaturesAdlib, @@ -873,7 +873,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "da3c54be18ab73fbdb32db24624a9c23"), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -886,7 +886,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "2f54b330d21f65b04b7c1f8cca76426c", 262109), FR_FRA, kPlatformAtariST, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -899,7 +899,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "11103b304286c23945560b391fd37e7d", 3181890), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -912,7 +912,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "da3c54be18ab73fbdb32db24624a9c23", 3181825), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -925,7 +925,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "569d679fe41d49972d34c9fce5930dda", 269825), EN_ANY, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -938,7 +938,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "00f6b4e2ee26e5c40b488e2df5adcf03", 3975580), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -951,7 +951,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "da3c54be18ab73fbdb32db24624a9c23", 3181825), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -964,7 +964,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "e453bea7b28a67c930764d945f64d898", 3913628), EN_ANY, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -977,7 +977,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "7b7f48490dedc8a7cb999388e2fadbe3", 3930674), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -990,7 +990,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "3712e7527ba8ce5637d2aadf62783005", 72318), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -1003,7 +1003,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "f1f78b663893b58887add182a77df151", 3944090), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -1016,7 +1016,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "cd322cb3c64ef2ba2f2134aa2122cfe9", 3936700), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -1033,7 +1033,7 @@ static const GOBGameDescription gameDescriptions[] = { }, FR_FRA, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -1046,7 +1046,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1059,7 +1059,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1072,7 +1072,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1085,7 +1085,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1098,7 +1098,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1111,7 +1111,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6263d09e996c1b4e84ef2d650b820e57", 4831170), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1124,7 +1124,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1137,7 +1137,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1150,7 +1150,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1163,7 +1163,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1176,7 +1176,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1189,7 +1189,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "795be7011ec31bf5bb8ce4efdb9ee5d3", 4838904), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -1202,7 +1202,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("demo.stk", "c06f8cc20eb239d4c71f225ce3093edf"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeLostInTime, kFeaturesAdlib, @@ -1215,7 +1215,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("demo.stk", "2eba8abd9e3878c57307576012dd2fec"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeLostInTime, kFeaturesAdlib, @@ -1228,7 +1228,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "32b0f57f5ae79a9ae97e8011df38af42", 157084), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1241,7 +1241,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "16b014bf32dbd6ab4c5163c44f56fed1", 445104), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1258,7 +1258,7 @@ static const GOBGameDescription gameDescriptions[] = { }, EN_GRB, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1271,7 +1271,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "1e2f64ec8dfa89f42ee49936a27e66e7"), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1284,7 +1284,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "f6d225b25a180606fa5dbe6405c97380"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1297,7 +1297,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "e42a4f2337d6549487a80864d7826972"), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1310,7 +1310,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "fe8144daece35538085adb59c2d29613", 159402), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1323,7 +1323,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "4e3af248a48a2321364736afab868527"), RU_RUS, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1336,7 +1336,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "8d28ce1591b0e9cc79bf41cad0fc4c9c"), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1349,7 +1349,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "d3b72938fbbc8159198088811f9e6d19", 160382), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -1362,7 +1362,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "bd679eafde2084d8011f247e51b5a805"), EN_GRB, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesNone, @@ -1375,7 +1375,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "bd679eafde2084d8011f247e51b5a805"), DE_DEU, kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesNone, @@ -1388,7 +1388,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "6f2c226c62dd7ab0ab6f850e89d3fc47"), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -1401,7 +1401,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"), EN_ANY, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -1414,7 +1414,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -1427,7 +1427,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -1440,7 +1440,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -1453,7 +1453,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -1466,7 +1466,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "7aebd94e49c2c5c518c9e7b74f25de9d"), FR_FRA, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob3, kFeaturesAdlib, @@ -1479,7 +1479,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "e5dcbc9f6658ebb1e8fe26bc4da0806d"), FR_FRA, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob3, kFeaturesAdlib, @@ -1492,7 +1492,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1("intro.stk", "b9b898fccebe02b69c086052d5024a55"), UNK_LANG, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob3, kFeaturesAdlib, @@ -1505,7 +1505,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "9e20ad7b471b01f84db526da34eaf0a2", 395561), EN_ANY, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeGob3, kFeaturesAdlib, @@ -1518,7 +1518,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesCD, @@ -1531,7 +1531,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesCD, @@ -1544,7 +1544,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesCD, @@ -1557,7 +1557,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesCD, @@ -1570,7 +1570,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "47c3b452767c4f49ea7b109143e77c30", 916828), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesCD, @@ -1583,7 +1583,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesAdlib, @@ -1596,7 +1596,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesAdlib, @@ -1609,7 +1609,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeInca2, kFeaturesAdlib, @@ -1622,7 +1622,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1635,7 +1635,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1648,7 +1648,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1661,7 +1661,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1674,7 +1674,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1687,7 +1687,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1700,7 +1700,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1713,7 +1713,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1726,7 +1726,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1739,7 +1739,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "b50fee012a5abcd0ac2963e1b4b56bec", 20298108), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1752,7 +1752,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "5f5f4e0a72c33391e67a47674b120cc6", 20296422), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1765,7 +1765,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1778,7 +1778,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1791,7 +1791,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1804,7 +1804,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1817,7 +1817,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "270529d9b8cce770b1575908a3800b52", 20296452), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1830,7 +1830,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1843,7 +1843,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1856,7 +1856,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "f4c344023b073782d2fddd9d8b515318", 7069736), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1869,7 +1869,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736), EN_GRB, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1882,7 +1882,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736), DE_DEU, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1895,7 +1895,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1908,7 +1908,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736), IT_ITA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1921,7 +1921,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "60348a87651f92e8492ee070556a96d8", 7069736), ES_ESP, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1934,7 +1934,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "08a96bf061af1fa4f75c6a7cc56b60a4", 20734979), PL_POL, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -1947,7 +1947,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "6190e32404b672f4bbbc39cf76f41fda", 2511470), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeDynasty, kFeatures640, @@ -1960,7 +1960,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "61e4069c16e27775a6cc6d20f529fb36", 2511300), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeDynasty, kFeatures640, @@ -1973,7 +1973,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "61e4069c16e27775a6cc6d20f529fb36", 2511300), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeDynasty, kFeatures640, @@ -1986,7 +1986,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "464538a17ed39755d7f1ba9c751af1bd", 1847864), EN_USA, kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, kGameTypeDynasty, kFeatures640, @@ -1999,7 +1999,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "3ab2c542bd9216ae5d02cc6f45701ae1", 1252436), EN_USA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeUrban, kFeatures640, @@ -2012,7 +2012,7 @@ static const GOBGameDescription gameDescriptions[] = { AD_ENTRY1s("intro.stk", "b991ed1d31c793e560edefdb349882ef", 1276408), FR_FRA, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeUrban, kFeatures640, @@ -2029,7 +2029,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesNone, @@ -2042,7 +2042,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob1, kFeaturesCD, @@ -2055,7 +2055,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -2068,7 +2068,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesAdlib, @@ -2081,7 +2081,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob2, kFeaturesCD, @@ -2094,7 +2094,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeBargon, kFeaturesNone, @@ -2107,7 +2107,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesAdlib, @@ -2120,7 +2120,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeGob3, kFeaturesCD, @@ -2133,7 +2133,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeWoodruff, kFeatures640, @@ -2146,7 +2146,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -2159,7 +2159,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesAdlib, @@ -2172,7 +2172,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeLostInTime, kFeaturesCD, @@ -2185,7 +2185,7 @@ static const GOBGameDescription fallbackDescs[] = { AD_ENTRY1(0, 0), UNK_LANG, kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, kGameTypeUrban, kFeaturesCD, @@ -2232,9 +2232,9 @@ static const ADParams detectionParams = { 0 }; -class GobMetaEngine : public Common::AdvancedMetaEngine { +class GobMetaEngine : public AdvancedMetaEngine { public: - GobMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + GobMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Gob Engine"; @@ -2245,7 +2245,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; }; bool GobMetaEngine::hasFeature(MetaEngineFeature f) const { @@ -2256,7 +2256,7 @@ bool Gob::GobEngine::hasFeature(EngineFeature f) const { return (f == kSupportsRTL); } -bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Gob::GOBGameDescription *gd = (const Gob::GOBGameDescription *)desc; if (gd) { *engine = new Gob::GobEngine(syst); diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index e29a387e46..0b9d7424bb 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -59,7 +59,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "t7g", "", AD_ENTRY1s("script.grv", "d1b8033b40aa67c076039881eccce90d", 16659), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieT7G, 0 }, @@ -69,7 +69,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "t7g", "", AD_ENTRY1s("script.grv", "6e30b54b1f3bc2262cdcf7961db2ae67", 17191), - Common::EN_ANY, Common::kPlatformMacintosh, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS }, kGroovieT7G, 0 }, @@ -83,7 +83,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "intro.gjd", 0, NULL, 31711554}, { NULL, 0, NULL, 0} }, - Common::RU_RUS, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieT7G, 0 }, @@ -94,7 +94,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "11h", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -104,7 +104,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "11h", "Demo", AD_ENTRY1s("disk.1", "aacb32ce07e0df2894bd83a3dee40c12", 70), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_DEMO + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO }, kGroovieV2, 1 }, @@ -114,7 +114,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "making11h", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 2 }, @@ -124,7 +124,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "clantrailer", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 3 }, @@ -134,7 +134,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "clandestiny", "", AD_ENTRY1s("disk.1", "f79fc1515174540fef6a34132efc4c53", 76), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -144,7 +144,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "unclehenry", "", AD_ENTRY1s("disk.1", "0e1b1d3cecc4fc7efa62a968844d1f7a", 72), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -154,7 +154,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "tlc", "", AD_ENTRY1s("disk.1", "32a1afa68478f1f9d2b25eeea427f2e3", 84), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -163,7 +163,7 @@ static const GroovieGameDescription gameDescriptions[] = { {AD_TABLE_END_MARKER, kGroovieT7G, 0} }; -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)gameDescriptions, // Size of that superset structure @@ -183,9 +183,9 @@ static const Common::ADParams detectionParams = { }; -class GroovieMetaEngine : public Common::AdvancedMetaEngine { +class GroovieMetaEngine : public AdvancedMetaEngine { public: - GroovieMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + GroovieMetaEngine() : AdvancedMetaEngine(detectionParams) {} const char *getName() const { return "Groovie Engine"; @@ -195,7 +195,7 @@ public: return "Groovie Engine (C) 1990-1996 Trilobyte"; } - bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *gd) const; + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; bool hasFeature(MetaEngineFeature f) const; SaveStateList listSaves(const char *target) const; @@ -204,7 +204,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; }; -bool GroovieMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *gd) const { +bool GroovieMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) { *engine = new GroovieEngine(syst, (GroovieGameDescription *)gd); } diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h index 640b7b6996..008af42eeb 100644 --- a/engines/groovie/groovie.h +++ b/engines/groovie/groovie.h @@ -26,7 +26,7 @@ #ifndef GROOVIE_H #define GROOVIE_H -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "engines/engine.h" #include "graphics/surface.h" @@ -62,7 +62,7 @@ enum kEngineVersion { }; struct GroovieGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; kEngineVersion version; // Version of the engine int indexEntry; // The index of the entry in disk.1 for V2 games diff --git a/engines/igor/detection.cpp b/engines/igor/detection.cpp index b04de19fb9..3d821fa639 100644 --- a/engines/igor/detection.cpp +++ b/engines/igor/detection.cpp @@ -25,13 +25,13 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/config-manager.h" #include "igor/igor.h" struct IgorGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameVersion; int gameFlags; }; @@ -48,7 +48,7 @@ static const IgorGameDescription igorGameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, Igor::kIdEngDemo100, Igor::kFlagDemo | Igor::kFlagFloppy @@ -64,7 +64,7 @@ static const IgorGameDescription igorGameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, Igor::kIdEngDemo110, Igor::kFlagDemo | Igor::kFlagFloppy @@ -80,7 +80,7 @@ static const IgorGameDescription igorGameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, Igor::kIdSpaCD, Igor::kFlagTalkie @@ -93,7 +93,7 @@ static const PlainGameDescriptor igorGameDescriptors[] = { { 0, 0 } }; -static const Common::ADParams igorDetectionParams = { +static const ADParams igorDetectionParams = { (const byte *)igorGameDescriptions, sizeof(IgorGameDescription), 1024, // number of md5 bytes @@ -104,9 +104,9 @@ static const Common::ADParams igorDetectionParams = { 0 }; -class IgorMetaEngine : public Common::AdvancedMetaEngine { +class IgorMetaEngine : public AdvancedMetaEngine { public: - IgorMetaEngine() : Common::AdvancedMetaEngine(igorDetectionParams) {} + IgorMetaEngine() : AdvancedMetaEngine(igorDetectionParams) {} virtual const char *getName() const { return "Igor: Objective Uikokahonia"; @@ -116,10 +116,10 @@ public: return "Igor: Objective Uikokahonia (C) Pendulo Studios"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; }; -bool IgorMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool IgorMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const IgorGameDescription *gd = (const IgorGameDescription *)desc; if (gd) { Igor::DetectedGameVersion dgv; diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index d0a73800e6..3a1135a0aa 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -29,13 +29,13 @@ #include "kyra/lol.h" #include "common/config-manager.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/savefile.h" #include "base/plugins.h" struct KYRAGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; Kyra::GameFlags flags; }; @@ -82,7 +82,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("DISK1.EXE", "c8641d0414d6c966d0a3dad79db07bf4"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_CMP_FLAGS }, @@ -94,7 +94,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("DISK1.EXE", "5d5cee4c3d0b68d586788b74243d254a"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_CMP_FLAGS }, @@ -107,7 +107,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "3c244298395520bb62b5edfe41688879"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -118,7 +118,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "796e44863dd22fa635b042df1bf16673"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -129,7 +129,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "abf8eb360e79a6c2a837751fbd4d3d24"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -140,7 +140,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "6018e1dfeaca7fe83f8d0b00eb0dd049"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -151,7 +151,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "f0b276781f47c130f423ec9679fe9ed9"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -162,7 +162,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "8909b41596913b3f5deaf3c9f1017b01"), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -173,7 +173,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "747861d2a9c643c59fdab570df5b9093"), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -184,7 +184,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.EMC", "ef08c8c237ee1473fd52578303fc36df"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -196,7 +196,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.PAK", "2bd1da653eaefd691e050e4a9eb68a64"), Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_AMIGA_FLAGS }, @@ -212,7 +212,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_FLOPPY_FLAGS }, @@ -228,7 +228,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformFMTowns, - Common::ADGF_CD + ADGF_CD }, KYRA1_TOWNS_FLAGS }, @@ -243,7 +243,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::JA_JPN, Common::kPlatformFMTowns, - Common::ADGF_CD + ADGF_CD }, KYRA1_TOWNS_SJIS_FLAGS }, @@ -259,7 +259,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC98, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_TOWNS_FLAGS }, @@ -274,7 +274,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::JA_JPN, Common::kPlatformPC98, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA1_TOWNS_SJIS_FLAGS }, @@ -286,7 +286,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.PAK", "fac399fe62f98671e56a005c5e94e39f"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_CD + ADGF_CD }, KYRA1_CD_FLAGS }, @@ -297,7 +297,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.PAK", "230f54e6afc007ab4117159181a1c722"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_CD + ADGF_CD }, KYRA1_CD_FLAGS }, @@ -308,7 +308,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.PAK", "b037c41768b652a040360ffa3556fd2a"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_CD + ADGF_CD }, KYRA1_CD_FLAGS }, @@ -320,7 +320,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("GEMCUT.PAK", "d8327fc4b7a72b23c900fa13aef4093a"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_CD + ADGF_CD }, KYRA1_CD_FLAGS }, @@ -332,7 +332,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("DEMO1.WSA", "fb722947d94897512b13b50cc84fd648"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, KYRA1_DEMO_FLAGS }, @@ -344,7 +344,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("WESTWOOD.001", "3f52dda68c4f7696c8309038be9f4151"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA2_FLOPPY_CMP_FLAGS }, @@ -356,7 +356,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("WESTWOOD.001", "d787b9559afddfe058b84c0b3a787224"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA2_FLOPPY_CMP_FLAGS }, @@ -368,7 +368,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "1ba18be685ad8e5a0ab5d46a0ce4d345"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA2_FLOPPY_FLAGS }, @@ -380,7 +380,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "262fb69dd8e52e596c7aefc6456f7c1b"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA2_FLOPPY_FLAGS }, @@ -392,7 +392,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "f7de11506b4c8fdf64bc763206c3e4e7"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA2_FLOPPY_FLAGS }, @@ -404,7 +404,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "e0a70c31b022cb4bb3061890020fc27c"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, KYRA2_FLOPPY_FLAGS }, @@ -416,7 +416,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FLAGS }, @@ -427,7 +427,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FLAGS }, @@ -438,7 +438,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FLAGS }, @@ -451,7 +451,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "30487f3b8d7790c7857f4769ff2dd125"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -462,7 +462,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "30487f3b8d7790c7857f4769ff2dd125"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -473,7 +473,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "30487f3b8d7790c7857f4769ff2dd125"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -485,7 +485,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "39772ff82e42c4c520050518deb82e64"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -497,7 +497,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "39772ff82e42c4c520050518deb82e64"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -509,7 +509,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("FATE.PAK", "39772ff82e42c4c520050518deb82e64"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY) }, @@ -521,7 +521,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD | Common::ADGF_DEMO + ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO }, KYRA2_CD_DEMO_FLAGS }, @@ -533,7 +533,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD | Common::ADGF_DEMO + ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO }, KYRA2_CD_DEMO_FLAGS }, @@ -545,7 +545,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD | Common::ADGF_DEMO + ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO }, KYRA2_CD_DEMO_FLAGS }, @@ -557,7 +557,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("VOC.PAK", "ecb3561b63749158172bf21528cf5f45"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, KYRA2_DEMO_FLAGS }, @@ -569,7 +569,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"), Common::EN_ANY, Common::kPlatformFMTowns, - Common::ADGF_CD + ADGF_CD }, KYRA2_TOWNS_FLAGS }, @@ -580,7 +580,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"), Common::JA_JPN, Common::kPlatformFMTowns, - Common::ADGF_CD + ADGF_CD }, KYRA2_TOWNS_SJIS_FLAGS }, @@ -591,7 +591,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"), Common::EN_ANY, Common::kPlatformPC98, - Common::ADGF_CD + ADGF_CD }, KYRA2_TOWNS_FLAGS }, @@ -602,7 +602,7 @@ const KYRAGameDescription adGameDescs[] = { AD_ENTRY1("WSCORE.PAK", "c44de1302b67f27d4707409987b7a685"), Common::JA_JPN, Common::kPlatformPC98, - Common::ADGF_CD + ADGF_CD }, KYRA2_TOWNS_SJIS_FLAGS }, @@ -621,7 +621,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FLAGS }, @@ -636,7 +636,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FLAGS }, @@ -651,7 +651,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FLAGS }, @@ -668,7 +668,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_INS_FLAGS }, @@ -683,7 +683,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_INS_FLAGS }, @@ -698,7 +698,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_INS_FLAGS }, @@ -715,7 +715,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_INS_FLAGS }, @@ -730,7 +730,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformMacintosh, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_INS_FLAGS }, @@ -745,7 +745,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::FR_FRA, Common::kPlatformMacintosh, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_INS_FLAGS }, @@ -762,7 +762,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY) }, @@ -777,7 +777,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY) }, @@ -792,7 +792,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY) }, @@ -809,7 +809,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA) }, @@ -824,7 +824,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA) }, @@ -839,7 +839,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA) }, @@ -856,7 +856,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, LOL_CD_FLAGS }, @@ -872,7 +872,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, LOL_CD_FLAGS }, @@ -888,7 +888,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, LOL_CD_FLAGS }, @@ -904,7 +904,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, LOL_CD_FLAGS }, @@ -920,7 +920,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, LOL_CD_FLAGS }, @@ -936,7 +936,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE | Common::ADGF_CD + ADGF_DROPLANGUAGE | ADGF_CD }, LOL_CD_FLAGS }, @@ -951,7 +951,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, LOL_FLOPPY_CMP_FLAGS }, @@ -967,7 +967,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, LOL_FLOPPY_FLAGS }, @@ -984,7 +984,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC98, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, LOL_PC98_FLAGS }, @@ -1000,7 +1000,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::JA_JPN, Common::kPlatformPC98, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, LOL_PC98_SJIS_FLAGS },*/ @@ -1015,7 +1015,7 @@ const KYRAGameDescription adGameDescs[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, LOL_DEMO_FLAGS }, @@ -1031,7 +1031,7 @@ const PlainGameDescriptor gameList[] = { { 0, 0 } }; -const Common::ADParams detectionParams = { +const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)adGameDescs, // Size of that superset structure @@ -1052,9 +1052,9 @@ const Common::ADParams detectionParams = { } // End of anonymous namespace -class KyraMetaEngine : public Common::AdvancedMetaEngine { +class KyraMetaEngine : public AdvancedMetaEngine { public: - KyraMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + KyraMetaEngine() : AdvancedMetaEngine(detectionParams) {} const char *getName() const { return "Legend of Kyrandia Engine"; @@ -1065,7 +1065,7 @@ public: } bool hasFeature(MetaEngineFeature f) const; - bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; @@ -1088,7 +1088,7 @@ bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const KYRAGameDescription *gd = (const KYRAGameDescription *)desc; bool res = true; diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index cb1f21ba9c..d62a440731 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/savefile.h" #include "lure/lure.h" @@ -33,7 +33,7 @@ namespace Lure { struct LureGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; uint32 features; }; @@ -60,7 +60,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.ega", "e9c9fdd8a19f7910d68e53cb84651273"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY | GF_EGA, }, @@ -72,7 +72,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.vga", "b2a8aa6d7865813a17a3c636e063572e"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY, }, @@ -84,7 +84,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.ega", "b80aced0321f64c58df2c7d3d74dfe79"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY | GF_EGA, }, @@ -96,7 +96,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.vga", "cf69d5ada228dd74f89046691c16aafb"), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY, }, @@ -108,7 +108,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.vga", "7aa19e444dab1ac7194d9f7a40ffe54a"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY, }, @@ -120,7 +120,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.vga", "894a2c2caeccbad2fc2f4a79a8ee47b0"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY, }, @@ -132,7 +132,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.vga", "1c94475c1bb7e0e88c1757d3b5377e94"), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY, }, @@ -144,7 +144,7 @@ static const LureGameDescription gameDescriptions[] = { AD_ENTRY1("disk1.vga", "1751145b653959f7a64fe1618d6b97ac"), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GF_FLOPPY, }, @@ -154,7 +154,7 @@ static const LureGameDescription gameDescriptions[] = { } // End of namespace Lure -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Lure::gameDescriptions, // Size of that superset structure @@ -170,12 +170,12 @@ static const Common::ADParams detectionParams = { // List of files for file-based fallback detection (optional) 0, // Flags - Common::kADFlagUseExtraAsHint + kADFlagUseExtraAsHint }; -class LureMetaEngine : public Common::AdvancedMetaEngine { +class LureMetaEngine : public AdvancedMetaEngine { public: - LureMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + LureMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Lure of the Temptress Engine"; @@ -186,7 +186,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; @@ -204,7 +204,7 @@ bool Lure::LureEngine::hasFeature(EngineFeature f) const { (f == kSupportsRTL); } -bool LureMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool LureMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Lure::LureGameDescription *gd = (const Lure::LureGameDescription *)desc; if (gd) { *engine = new Lure::LureEngine(syst, gd); diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp index 259c18f6a7..8bcb5ca166 100644 --- a/engines/m4/detection.cpp +++ b/engines/m4/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "m4/m4.h" #include "m4/resource.h" @@ -33,7 +33,7 @@ namespace M4 { struct M4GameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameType; uint32 features; @@ -79,7 +79,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Burger, kFeaturesCD @@ -94,7 +94,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Burger, kFeaturesCD @@ -109,7 +109,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_Burger, kFeaturesDemo @@ -124,7 +124,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_Burger, kFeaturesDemo @@ -139,7 +139,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Riddle, kFeaturesCD @@ -154,7 +154,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Riddle, kFeaturesCD @@ -169,7 +169,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Riddle, kFeaturesCD @@ -184,7 +184,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Riddle, kFeaturesCD @@ -199,7 +199,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Riddle, kFeaturesCD @@ -214,7 +214,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_Riddle, kFeaturesDemo @@ -229,7 +229,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_RexNebular, kFeaturesNone @@ -244,7 +244,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_RexNebular, kFeaturesDemo @@ -259,7 +259,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_DragonSphere, kFeaturesNone @@ -275,7 +275,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_DragonSphere, kFeaturesCD @@ -290,7 +290,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_DragonSphere, kFeaturesDemo @@ -305,7 +305,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Phantom, kFeaturesNone @@ -320,7 +320,7 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Phantom, kFeaturesCD @@ -335,17 +335,17 @@ static const M4GameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_Phantom, kFeaturesDemo }, - { { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, Common::ADGF_NO_FLAGS }, 0, 0 } + { { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, ADGF_NO_FLAGS }, 0, 0 } }; } -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)M4::gameDescriptions, // Size of that superset structure @@ -364,9 +364,9 @@ static const Common::ADParams detectionParams = { 0 }; -class M4MetaEngine : public Common::AdvancedMetaEngine { +class M4MetaEngine : public AdvancedMetaEngine { public: - M4MetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + M4MetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "MADS/M4 engine"; @@ -376,10 +376,10 @@ public: return "Riddle of Master Lu & Orion Burger (C) Sanctuary Woods"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; }; -bool M4MetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool M4MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const M4::M4GameDescription *gd = (const M4::M4GameDescription *)desc; if (gd) { *engine = new M4::M4Engine(syst, gd); diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index e59bc2ef7f..5d3101a617 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/file.h" #include "made/made.h" @@ -34,7 +34,7 @@ namespace Made { struct MadeGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameID; int gameType; @@ -87,7 +87,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.dat", "e95c38ded389e39cfbf87a8cb250b12e"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -104,7 +104,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.red", "cd8b62ece4677c438688c1de3f5379b9"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -120,7 +120,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.dat", "a1db8c97a78dae10f91d356f16ad07b8"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -136,7 +136,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.red", "c4e2430e6b6c6ff1562a80fb4a9df24c"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -153,7 +153,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.dat", "9d740378da2d16e83d0d0efff01bf83a"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -169,7 +169,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -187,7 +187,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.dat", "9d740378da2d16e83d0d0efff01bf83a"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -205,7 +205,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2"), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -221,7 +221,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rtz.prj", "764d02f52ce1c219f2c0066677fba4ce"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RTZ, 0, @@ -237,7 +237,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("demo.dat", "2a6a1354bd5346fad4aee08e5b56caaa"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GID_RTZ, 0, @@ -253,7 +253,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("manhole.dat", "cb21e31ed35c963208343bc995225b73"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_MANHOLE, 0, @@ -269,7 +269,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("manhole.dat", "2b1658292599a861c4cd3cf6cdb3c581"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_MANHOLE, 0, @@ -285,7 +285,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("lgop2.dat", "8137996db200ff67e8f172ff106f2e48"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_LGOP2, 0, @@ -301,7 +301,7 @@ static const MadeGameDescription gameDescriptions[] = { AD_ENTRY1("rodneys.dat", "a79887dbaa47689facd7c6f09258ba5a"), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_RODNEY, 0, @@ -323,7 +323,7 @@ static MadeGameDescription g_fallbackDesc = { AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor Common::UNK_LANG, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, 0, 0, @@ -333,7 +333,7 @@ static MadeGameDescription g_fallbackDesc = { } // End of namespace Made -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Made::gameDescriptions, // Size of that superset structure @@ -352,9 +352,9 @@ static const Common::ADParams detectionParams = { 0 }; -class MadeMetaEngine : public Common::AdvancedMetaEngine { +class MadeMetaEngine : public AdvancedMetaEngine { public: - MadeMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + MadeMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "MADE Engine"; @@ -365,9 +365,9 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; - const Common::ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; + const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; }; @@ -381,7 +381,7 @@ bool Made::MadeEngine::hasFeature(EngineFeature f) const { (f == kSupportsRTL); } -bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Made::MadeGameDescription *gd = (const Made::MadeGameDescription *)desc; if (gd) { *engine = new Made::MadeEngine(syst, gd); @@ -389,18 +389,18 @@ bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common return gd != 0; } -const Common::ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist) const { +const ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist) const { // Set the default values for the fallback descriptor's ADGameDescription part. Made::g_fallbackDesc.desc.language = Common::UNK_LANG; Made::g_fallbackDesc.desc.platform = Common::kPlatformPC; - Made::g_fallbackDesc.desc.flags = Common::ADGF_NO_FLAGS; + Made::g_fallbackDesc.desc.flags = ADGF_NO_FLAGS; // Set default values for the fallback descriptor's MadeGameDescription part. Made::g_fallbackDesc.gameID = 0; Made::g_fallbackDesc.features = 0; Made::g_fallbackDesc.version = 3; - //return (const Common::ADGameDescription *)&Made::g_fallbackDesc; + //return (const ADGameDescription *)&Made::g_fallbackDesc; return NULL; } diff --git a/engines/module.mk b/engines/module.mk index 8102046c5b..7fd9980d4b 100644 --- a/engines/module.mk +++ b/engines/module.mk @@ -1,6 +1,7 @@ MODULE := engines MODULE_OBJS := \ + advancedDetector.o \ dialogs.o \ engine.o \ game.o diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 10882662d1..17f43e2e6a 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -26,7 +26,7 @@ #include "base/plugins.h" #include "common/config-manager.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/system.h" #include "parallaction/parallaction.h" @@ -34,7 +34,7 @@ namespace Parallaction { struct PARALLACTIONGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameType; uint32 features; @@ -73,7 +73,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::UNK_LANG, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Nippon, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT, @@ -96,7 +96,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::UNK_LANG, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Nippon, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_MULT, @@ -113,7 +113,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, GType_Nippon, GF_LANG_EN | GF_DEMO, @@ -135,7 +135,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_Nippon, GF_LANG_IT, @@ -152,7 +152,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::UNK_LANG, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_BRA, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT, @@ -168,7 +168,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::UNK_LANG, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GType_BRA, GF_LANG_EN | GF_DEMO, @@ -185,7 +185,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::UNK_LANG, Common::kPlatformAmiga, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GType_BRA, GF_LANG_EN | GF_LANG_FR | GF_LANG_DE | GF_LANG_IT | GF_LANG_MULT, @@ -202,7 +202,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { }, Common::UNK_LANG, Common::kPlatformAmiga, - Common::ADGF_DEMO + ADGF_DEMO }, GType_BRA, GF_LANG_EN | GF_DEMO, @@ -213,7 +213,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { } -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Parallaction::gameDescriptions, // Size of that superset structure @@ -232,9 +232,9 @@ static const Common::ADParams detectionParams = { 0 }; -class ParallactionMetaEngine : public Common::AdvancedMetaEngine { +class ParallactionMetaEngine : public AdvancedMetaEngine { public: - ParallactionMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + ParallactionMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Parallaction engine"; @@ -245,7 +245,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; @@ -263,7 +263,7 @@ bool Parallaction::Parallaction::hasFeature(EngineFeature f) const { (f == kSupportsRTL); } -bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Parallaction::PARALLACTIONGameDescription *gd = (const Parallaction::PARALLACTIONGameDescription *)desc; bool res = true; diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 2e1a0f2833..55f9f5248c 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -30,7 +30,7 @@ #include "base/plugins.h" #include "common/config-manager.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/system.h" #include "graphics/thumbnail.h" @@ -43,7 +43,7 @@ namespace Saga { struct SAGAGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameId; uint32 features; @@ -81,7 +81,7 @@ int SagaEngine::getGameNumber() const { return _gameNumber; } int SagaEngine::getStartSceneNumber() const { return _gameDescription->startSceneNumber; } const GamePatchDescription *SagaEngine::getPatchDescriptions() const { return _gameDescription->patchDescriptions; } -const Common::ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; } +const ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _gameDescription->desc.filesDescriptions; } } @@ -94,7 +94,7 @@ static const PlainGameDescriptor sagaGames[] = { {0, 0} }; -static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = { +static const ADObsoleteGameID obsoleteGameIDsTable[] = { {"ite", "saga", Common::kPlatformUnknown}, {"ihnm", "saga", Common::kPlatformUnknown}, {"dino", "saga", Common::kPlatformUnknown}, @@ -104,7 +104,7 @@ static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = { #include "saga/detection_tables.h" -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Saga::gameDescriptions, // Size of that superset structure @@ -123,9 +123,9 @@ static const Common::ADParams detectionParams = { 0 }; -class SagaMetaEngine : public Common::AdvancedMetaEngine { +class SagaMetaEngine : public AdvancedMetaEngine { public: - SagaMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + SagaMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Saga engine [" @@ -154,7 +154,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; @@ -178,7 +178,7 @@ bool Saga::SagaEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Saga::SAGAGameDescription *gd = (const Saga::SAGAGameDescription *)desc; if (gd) { *engine = new Saga::SagaEngine(syst, gd); diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h index 500d5d9fed..e9099141d6 100644 --- a/engines/saga/detection_tables.h +++ b/engines/saga/detection_tables.h @@ -192,7 +192,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GID_ITE, // Game id GF_OLD_ITE_DOS, // features @@ -216,7 +216,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_DEMO + ADGF_DEMO }, GID_ITE, GF_WYRMKEEP | GF_SCENE_SUBSTITUTES | GF_MONO_MUSIC | GF_LE_VOICES, @@ -241,7 +241,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_DEMO + ADGF_DEMO }, GID_ITE, GF_WYRMKEEP | GF_NON_INTERACTIVE | GF_LE_VOICES, @@ -266,7 +266,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_DEMO + ADGF_DEMO }, GID_ITE, GF_WYRMKEEP | GF_SCENE_SUBSTITUTES, @@ -291,7 +291,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformWindows, - Common::ADGF_DEMO + ADGF_DEMO }, GID_ITE, GF_WYRMKEEP | GF_NON_INTERACTIVE | GF_8BIT_UNSIGNED_PCM, @@ -323,7 +323,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_8BIT_UNSIGNED_PCM, @@ -346,7 +346,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_WYRMKEEP, @@ -377,7 +377,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformUnknown, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_WYRMKEEP, @@ -406,7 +406,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformUnknown, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_WYRMKEEP, @@ -429,7 +429,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_EXTRA_ITE_CREDITS, @@ -452,7 +452,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, 0, @@ -475,7 +475,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, 0, @@ -499,7 +499,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, 0, @@ -525,7 +525,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_ITE_FLOPPY, @@ -548,7 +548,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_ITE_FLOPPY, @@ -571,7 +571,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_ITE, GF_ITE_FLOPPY, @@ -603,7 +603,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GID_IHNM, GF_IHNM_DEMO, @@ -634,7 +634,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_IHNM, 0, @@ -663,7 +663,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_IHNM, 0, @@ -690,7 +690,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_IHNM, 0, @@ -718,7 +718,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_IHNM, 0, @@ -745,7 +745,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_IHNM, 0, @@ -769,7 +769,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_IHNM, 0, @@ -803,7 +803,7 @@ static const SAGAGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_FTA2, 0, diff --git a/engines/saga/resource.cpp b/engines/saga/resource.cpp index e2fe158c12..981238d3a3 100644 --- a/engines/saga/resource.cpp +++ b/engines/saga/resource.cpp @@ -35,7 +35,7 @@ #include "saga/scene.h" #include "saga/sndres.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" namespace Saga { diff --git a/engines/saga/resource_hrs.cpp b/engines/saga/resource_hrs.cpp index e06d03c604..32d92531d8 100644 --- a/engines/saga/resource_hrs.cpp +++ b/engines/saga/resource_hrs.cpp @@ -37,7 +37,7 @@ #include "saga/scene.h" #include "saga/sndres.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/endian.h" namespace Saga { diff --git a/engines/saga/resource_res.cpp b/engines/saga/resource_res.cpp index ca3c2a7ae0..8de5529540 100644 --- a/engines/saga/resource_res.cpp +++ b/engines/saga/resource_res.cpp @@ -35,7 +35,7 @@ #include "saga/scene.h" #include "saga/sndres.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" namespace Saga { diff --git a/engines/saga/resource_rsc.cpp b/engines/saga/resource_rsc.cpp index 8176d6ec02..17b330ea5e 100644 --- a/engines/saga/resource_rsc.cpp +++ b/engines/saga/resource_rsc.cpp @@ -35,7 +35,7 @@ #include "saga/scene.h" #include "saga/sndres.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" namespace Saga { diff --git a/engines/saga/saga.h b/engines/saga/saga.h index f323e9617d..9f6b0d814b 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -34,9 +34,7 @@ #include "saga/gfx.h" #include "saga/list.h" -namespace Common { struct ADGameFileDescription; -} namespace Saga { @@ -603,7 +601,7 @@ public: const GamePatchDescription *getPatchDescriptions() const; - const Common::ADGameFileDescription *getFilesDescriptions() const; + const ADGameFileDescription *getFilesDescriptions() const; const Common::Rect &getDisplayClip() const { return _displayClip;} Common::Error loadGameState(int slot); diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 4855550351..4da4bf1ec3 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -719,7 +719,7 @@ GameList ScummMetaEngine::getSupportedGames() const { } GameDescriptor ScummMetaEngine::findGame(const char *gameid) const { - return Common::AdvancedDetector::findGameID(gameid, gameDescriptions, obsoleteGameIDsTable); + return AdvancedDetector::findGameID(gameid, gameDescriptions, obsoleteGameIDsTable); } GameList ScummMetaEngine::detectGames(const Common::FSList &fslist) const { @@ -783,7 +783,7 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co // We start by checking whether the specified game ID is obsolete. // If that is the case, we automatically upgrade the target to use // the correct new game ID (and platform, if specified). - for (const Common::ADObsoleteGameID *o = obsoleteGameIDsTable; o->from; ++o) { + for (const ADObsoleteGameID *o = obsoleteGameIDsTable; o->from; ++o) { if (!scumm_stricmp(gameid, o->from)) { // Match found, perform upgrade gameid = o->to; diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index d5ef6a8c83..4e11f4b29c 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -26,7 +26,7 @@ #ifndef SCUMM_DETECTION_TABLES_H #define SCUMM_DETECTION_TABLES_H -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/rect.h" #include "common/util.h" @@ -139,7 +139,7 @@ static const PlainGameDescriptor gameDescriptions[] = { * Conversion table mapping old obsolete game IDs to the * corresponding new game ID and platform combination. */ -static const Common::ADObsoleteGameID obsoleteGameIDsTable[] = { +static const ADObsoleteGameID obsoleteGameIDsTable[] = { {"bluesabctimedemo", "bluesabctime", UNK}, {"BluesBirthdayDemo", "BluesBirthday", UNK}, {"comidemo", "comi", UNK}, diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index e6cc131f47..5838aad79b 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -29,7 +29,7 @@ #include "base/plugins.h" #include "common/config-manager.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/system.h" #include "common/file.h" #include "common/fs.h" diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 08730f28be..bc135b3fb4 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -25,7 +25,7 @@ #include "base/plugins.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/file.h" #include "common/savefile.h" @@ -36,7 +36,7 @@ namespace Tinsel { struct TinselGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; int gameID; int gameType; @@ -96,7 +96,7 @@ static const TinselGameDescription gameDescriptions[] = { //AD_ENTRY1s("dw.scn", "ccd72f02183d0e96b6e7d8df9492cda8", 23308), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GID_DW1, 0, @@ -114,7 +114,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, GID_DW1, 0, @@ -129,7 +129,7 @@ static const TinselGameDescription gameDescriptions[] = { AD_ENTRY1s("dw.gra", "c8808ccd988d603dd35dff42013ae7fd", 781656), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW1, 0, @@ -147,7 +147,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW1, 0, @@ -171,7 +171,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, GID_DW1, 0, @@ -193,7 +193,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, GID_DW1, 0, @@ -215,7 +215,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, GID_DW1, 0, @@ -237,7 +237,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_DROPLANGUAGE + ADGF_DROPLANGUAGE }, GID_DW1, 0, @@ -256,7 +256,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW1, 0, @@ -276,7 +276,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW1, 0, @@ -293,7 +293,7 @@ static const TinselGameDescription gameDescriptions[] = { AD_ENTRY1s("dw.scn", "6182c7986eaec893c62fb6ea13a9f225", 774556), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW1, 0, @@ -312,7 +312,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_GRB, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW2, 0, @@ -331,7 +331,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_USA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW2, 0, @@ -350,7 +350,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW2, 0, @@ -369,7 +369,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW2, 0, @@ -389,7 +389,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW2, 0, @@ -408,7 +408,7 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, GID_DW2, 0, @@ -421,7 +421,7 @@ static const TinselGameDescription gameDescriptions[] = { } // End of namespace Tinsel -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)Tinsel::gameDescriptions, // Size of that superset structure @@ -440,9 +440,9 @@ static const Common::ADParams detectionParams = { 0 }; -class TinselMetaEngine : public Common::AdvancedMetaEngine { +class TinselMetaEngine : public AdvancedMetaEngine { public: - TinselMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + TinselMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Tinsel Engine"; @@ -452,7 +452,7 @@ public: return "Tinsel (C) Psygnosis"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; @@ -512,7 +512,7 @@ SaveStateList TinselMetaEngine::listSaves(const char *target) const { return saveList; } -bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Tinsel::TinselGameDescription *gd = (const Tinsel::TinselGameDescription *)desc; if (gd) { *engine = new Tinsel::TinselEngine(syst, gd); diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 2b9222ebe5..462b6c9ca4 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -24,7 +24,7 @@ */ #include "common/config-manager.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/savefile.h" #include "common/system.h" @@ -39,14 +39,14 @@ static const PlainGameDescriptor toucheGames[] = { namespace Touche { -static const Common::ADGameDescription gameDescriptions[] = { +static const ADGameDescription gameDescriptions[] = { { // retail version "touche", "", AD_ENTRY1s("touche.dat", "2af0177f8887e3430f345e6b4d8b1414", 26350211), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // retail version - tracker item #1601818 "touche", @@ -54,7 +54,7 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "95967f0b51d2e813e99ca00325098340", 26350190), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // retail version "touche", @@ -62,7 +62,7 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "1caa20bb4d4fc2ce8eb867b6610082b3", 26558232), Common::FR_FRA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // retail version - tracker item #1598643 "touche", @@ -70,7 +70,7 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "be2ae6454b3325e410946f2322547cd4", 26625537), Common::DE_DEU, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // retail version - tracker item #1681643 "touche", @@ -78,7 +78,7 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "64e95ba1decf5a5a60f8fa1840f40c62", 26529523), Common::ES_ESP, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // fan-made translation (http://www.iagtg.net/) - tracker item #1602360 "touche", @@ -86,7 +86,7 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "1f442331d4b327c3488a9f6ffe9bdd25", 26367792), Common::IT_ITA, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // retail version - tracker item #1800500 "touche", @@ -94,7 +94,7 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "42d19a0bef65465109020440a9caa228", 26487370), Common::PL_POL, Common::kPlatformPC, - Common::ADGF_NO_FLAGS + ADGF_NO_FLAGS }, { // demo version "touche", @@ -102,32 +102,32 @@ static const Common::ADGameDescription gameDescriptions[] = { AD_ENTRY1s("touche.dat", "ddaed436445b2e77294ed19e8ae4aa2c", 8720683), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO + ADGF_DEMO }, AD_TABLE_END_MARKER }; -static const Common::ADFileBasedFallback fileBasedFallback[] = { +static const ADFileBasedFallback fileBasedFallback[] = { { &gameDescriptions[0], { "touche.dat", 0 } }, // default to english version { 0, { 0 } } }; } // End of namespace Touche -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { (const byte *)Touche::gameDescriptions, - sizeof(Common::ADGameDescription), + sizeof(ADGameDescription), 4096, // number of md5 bytes toucheGames, 0, // no obsolete targets data "touche", Touche::fileBasedFallback, // file-based detection data to enable not yet known versions to start - Common::kADFlagPrintWarningOnFileBasedFallback + kADFlagPrintWarningOnFileBasedFallback }; -class ToucheMetaEngine : public Common::AdvancedMetaEngine { +class ToucheMetaEngine : public AdvancedMetaEngine { public: - ToucheMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + ToucheMetaEngine() : AdvancedMetaEngine(detectionParams) {} virtual const char *getName() const { return "Touche Engine"; @@ -138,7 +138,7 @@ public: } virtual bool hasFeature(MetaEngineFeature f) const; - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const; + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; @@ -158,7 +158,7 @@ bool Touche::ToucheEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { +bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Touche::ToucheEngine(syst, desc->language); } diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 57357ff504..197e20750c 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -24,7 +24,7 @@ */ #include "common/config-manager.h" -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "common/savefile.h" #include "common/system.h" #include "common/fs.h" @@ -38,7 +38,7 @@ static const PlainGameDescriptor tuckerGames[] = { { 0, 0 } }; -static const Common::ADGameDescription tuckerGameDescriptions[] = { +static const ADGameDescription tuckerGameDescriptions[] = { { "tucker", "", @@ -93,14 +93,14 @@ static const Common::ADGameDescription tuckerGameDescriptions[] = { AD_ENTRY1s("infobar.txt", "010b055de42097b140d5bcb6e95a5c7c", 203), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO | Tucker::kGameFlagDemo, + ADGF_DEMO | Tucker::kGameFlagDemo, }, AD_TABLE_END_MARKER }; -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { (const byte *)tuckerGameDescriptions, - sizeof(Common::ADGameDescription), + sizeof(ADGameDescription), 512, tuckerGames, 0, @@ -109,18 +109,18 @@ static const Common::ADParams detectionParams = { 0 }; -static const Common::ADGameDescription tuckerDemoGameDescription = { +static const ADGameDescription tuckerDemoGameDescription = { "tucker", "Non-Interactive Demo", AD_ENTRY1(0, 0), Common::EN_ANY, Common::kPlatformPC, - Common::ADGF_DEMO | Tucker::kGameFlagDemo | Tucker::kGameFlagIntroOnly + ADGF_DEMO | Tucker::kGameFlagDemo | Tucker::kGameFlagIntroOnly }; -class TuckerMetaEngine : public Common::AdvancedMetaEngine { +class TuckerMetaEngine : public AdvancedMetaEngine { public: - TuckerMetaEngine() : Common::AdvancedMetaEngine(detectionParams) { + TuckerMetaEngine() : AdvancedMetaEngine(detectionParams) { } virtual const char *getName() const { @@ -141,14 +141,14 @@ public: } } - virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const { + virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Tucker::TuckerEngine(syst, desc->language, desc->flags); } return desc != 0; } - virtual const Common::ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { + virtual const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const { for (Common::FSList::const_iterator d = fslist.begin(); d != fslist.end(); ++d) { Common::FSList audiofslist; if (d->isDirectory() && d->getName().equalsIgnoreCase("audio") && d->getChildren(audiofslist, Common::FSNode::kListFilesOnly)) { |