diff options
| author | Max Horn | 2006-12-20 00:08:51 +0000 |
|---|---|---|
| committer | Max Horn | 2006-12-20 00:08:51 +0000 |
| commit | 6eef02245cb5cf59d89eef8e020ae90b98109483 (patch) | |
| tree | dcbda2a08463a6cfa0ee1978c09043dbb900692e /common | |
| parent | dc30c2304c808dd25920e5f9a179533eb7a45555 (diff) | |
| download | scummvm-rg350-6eef02245cb5cf59d89eef8e020ae90b98109483.tar.gz scummvm-rg350-6eef02245cb5cf59d89eef8e020ae90b98109483.tar.bz2 scummvm-rg350-6eef02245cb5cf59d89eef8e020ae90b98109483.zip | |
Stripped some more real_ prefixes from function names; also added a new FIXME comment to Kyra's setupGameFlags, and did some more cleanup
svn-id: r24899
Diffstat (limited to 'common')
| -rw-r--r-- | common/advancedDetector.cpp | 6 | ||||
| -rw-r--r-- | common/advancedDetector.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp index afa97935d6..81994f1378 100644 --- a/common/advancedDetector.cpp +++ b/common/advancedDetector.cpp @@ -33,7 +33,7 @@ namespace Common { -PluginError real_ADVANCED_DETECTOR_ENGINE_CREATE( +PluginError ADVANCED_DETECTOR_ENGINE_CREATE( DetectedGameList (*detectFunc)(const FSList &fslist), const Common::ADObsoleteGameID *obsoleteList ) { @@ -72,7 +72,7 @@ PluginError real_ADVANCED_DETECTOR_ENGINE_CREATE( return kNoGameDataFoundError; } -GameDescriptor real_ADVANCED_DETECTOR_FIND_GAMEID( +GameDescriptor ADVANCED_DETECTOR_FIND_GAMEID( const char *gameid, const PlainGameDescriptor *list, const Common::ADObsoleteGameID *obsoleteList @@ -174,7 +174,7 @@ int ADVANCED_DETECTOR_DETECT_INIT_GAME( matches = ad.detectGame(0, md5Bytes, language, platform); for (uint i = 0; i < matches.size(); i++) { - if (toDetectedGame(*(const ADGameDescription *)(descs + matches[i] * descItemSize), list).gameid == gameid) { + if (((const ADGameDescription *)(descs + matches[i] * descItemSize))->gameid == gameid) { gameNumber = matches[i]; break; } diff --git a/common/advancedDetector.h b/common/advancedDetector.h index 741a4cf009..098aa1bec9 100644 --- a/common/advancedDetector.h +++ b/common/advancedDetector.h @@ -92,7 +92,7 @@ private: // FIXME/TODO: Rename this function to something more sensible. // Possibly move it inside class AdvancedDetector ? -GameDescriptor real_ADVANCED_DETECTOR_FIND_GAMEID( +GameDescriptor ADVANCED_DETECTOR_FIND_GAMEID( const char *gameid, const PlainGameDescriptor *list, const Common::ADObsoleteGameID *obsoleteList @@ -121,7 +121,7 @@ int ADVANCED_DETECTOR_DETECT_INIT_GAME( // FIXME/TODO: Rename this function to something more sensible. // Possibly move it inside class AdvancedDetector ? -PluginError real_ADVANCED_DETECTOR_ENGINE_CREATE( +PluginError ADVANCED_DETECTOR_ENGINE_CREATE( DetectedGameList (*detectFunc)(const FSList &fslist), const Common::ADObsoleteGameID *obsoleteList ); @@ -132,7 +132,7 @@ PluginError real_ADVANCED_DETECTOR_ENGINE_CREATE( return GameList(list); \ } \ GameDescriptor Engine_##engine##_findGameID(const char *gameid) { \ - return Common::real_ADVANCED_DETECTOR_FIND_GAMEID(gameid,list,obsoleteList); \ + return Common::ADVANCED_DETECTOR_FIND_GAMEID(gameid,list,obsoleteList); \ } \ DetectedGameList Engine_##engine##_detectGames(const FSList &fslist) { \ return detectFunc(fslist); \ @@ -140,7 +140,7 @@ PluginError real_ADVANCED_DETECTOR_ENGINE_CREATE( PluginError Engine_##engine##_create(OSystem *syst, Engine **engine) { \ assert(syst); \ assert(engine); \ - PluginError err = real_ADVANCED_DETECTOR_ENGINE_CREATE(detectFunc, obsoleteList); \ + PluginError err = ADVANCED_DETECTOR_ENGINE_CREATE(detectFunc, obsoleteList); \ if (err == kNoError) \ *engine = new createFunction(syst); \ return err; \ |