diff --git a/engines/queen/POTFILES b/engines/queen/POTFILES index 28624662ca9..67e7d35b993 100644 --- a/engines/queen/POTFILES +++ b/engines/queen/POTFILES @@ -1 +1 @@ -engines/queen/detection.cpp +engines/queen/metaengine.cpp diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index 02dc27756b1..396e8394f19 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -25,7 +25,6 @@ #include "common/gui_options.h" #include "common/file.h" -#include "common/translation.h" #include "queen/detection.h" #include "queen/resource.h" @@ -35,36 +34,6 @@ static const PlainGameDescriptor queenGames[] = { {nullptr, nullptr} }; -#define GAMEOPTION_ALT_INTRO GUIO_GAMEOPTIONS1 -#define GAMEOPTION_ALT_FONT GUIO_GAMEOPTIONS2 - -static const ADExtraGuiOptionsMap optionsList[] = { - { - GAMEOPTION_ALT_INTRO, - { - _s("Alternative intro"), - _s("Use an alternative game intro (CD version only)"), - "alt_intro", - false, - 0, - 0 - } - }, - { - GAMEOPTION_ALT_FONT, - { - _s("Improved font"), - _s("Use an easier to read custom font"), - "alt_font", - false, - 0, - 0 - } - }, - - AD_EXTRA_GUI_OPTIONS_TERMINATOR -}; - namespace Queen { static const QueenGameDescription gameDescriptions[] = { @@ -494,7 +463,7 @@ static const QueenGameDescription gameDescriptions[] = { class QueenMetaEngineDetection : public AdvancedMetaEngineDetection { public: - QueenMetaEngineDetection() : AdvancedMetaEngineDetection(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { + QueenMetaEngineDetection() : AdvancedMetaEngineDetection(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames) { } const char *getName() const override { diff --git a/engines/queen/detection.h b/engines/queen/detection.h index c8d162e5d85..4e65dd4c3ba 100644 --- a/engines/queen/detection.h +++ b/engines/queen/detection.h @@ -28,6 +28,9 @@ struct QueenGameDescription { ADGameDescription desc; }; +#define GAMEOPTION_ALT_INTRO GUIO_GAMEOPTIONS1 +#define GAMEOPTION_ALT_FONT GUIO_GAMEOPTIONS2 + } // End of namespace Queen #endif // QUEEN_DETECTION_H diff --git a/engines/queen/metaengine.cpp b/engines/queen/metaengine.cpp index 06bdd336dba..41482dc3d99 100644 --- a/engines/queen/metaengine.cpp +++ b/engines/queen/metaengine.cpp @@ -23,17 +23,49 @@ #include "common/savefile.h" #include "common/system.h" +#include "common/translation.h" #include "queen/queen.h" #include "queen/resource.h" #include "queen/detection.h" +static const ADExtraGuiOptionsMap optionsList[] = { + { + GAMEOPTION_ALT_INTRO, + { + _s("Alternative intro"), + _s("Use an alternative game intro (CD version only)"), + "alt_intro", + false, + 0, + 0 + } + }, + { + GAMEOPTION_ALT_FONT, + { + _s("Improved font"), + _s("Use an easier to read custom font"), + "alt_font", + false, + 0, + 0 + } + }, + + AD_EXTRA_GUI_OPTIONS_TERMINATOR +}; + class QueenMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "queen"; } + const ADExtraGuiOptionsMap *getAdvancedExtraGuiOptions() const override { + return optionsList; + } + bool hasFeature(MetaEngineFeature f) const override; Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; SaveStateList listSaves(const char *target) const override;