diff options
| author | Max Horn | 2009-01-29 22:13:01 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-29 22:13:01 +0000 |
| commit | 28cf213605ff916ddac62d6c07e02beb915a9a8f (patch) | |
| tree | fcb26632dfda8061f1bbe3497d5a1b167fc75bb4 /engines/scumm | |
| parent | 7eaafd933f1abed7146a8099df3aac0ffc3aea9a (diff) | |
| download | scummvm-rg350-28cf213605ff916ddac62d6c07e02beb915a9a8f.tar.gz scummvm-rg350-28cf213605ff916ddac62d6c07e02beb915a9a8f.tar.bz2 scummvm-rg350-28cf213605ff916ddac62d6c07e02beb915a9a8f.zip | |
Moved AdvancedDetector from common/ to engines/
svn-id: r36132
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/detection.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/detection_tables.h | 4 |
2 files changed, 4 insertions, 4 deletions
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}, |