diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/advancedDetector.h | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/advancedDetector.h')
| -rw-r--r-- | engines/advancedDetector.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 9a6b5e4ef7..0cec039b5e 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -26,6 +26,8 @@ #include "engines/metaengine.h" #include "engines/engine.h" +#include "common/gui_options.h" // FIXME: Temporary hack? + namespace Common { class Error; class FSList; @@ -101,7 +103,7 @@ typedef Common::Array<const ADGameDescription *> ADGameDescList; * 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, GUIO1(GUIO_NONE) } + { NULL, NULL, { { NULL, 0, NULL, 0 } }, Common::UNK_LANG, Common::kPlatformUnknown, ADGF_NO_FLAGS, GUIO0() } struct ADFileBasedFallback { /** @@ -169,7 +171,13 @@ protected: /** * Name of single gameid (optional). * - * @todo Properly explain this -- what does it do? + * Used to override gameid. + * This is a recommended setting to prevent global gameid pollution. + * With this option set, the gameid effectively turns into engineid. + * + * FIXME: This field actually removes a feature (gameid) in order to + * address a more generic problem. We should find a better way to + * disambiguate gameids. */ const char *_singleid; |