BURIED: Move the engine options into the MetaEngine subclass

engines/buried/POTFILES

@@ -1,3 +1,4 @@
 engines/buried/biochip_view.cpp
 engines/buried/buried.cpp
+engines/buried/metaengine.cpp
 engines/buried/saveload.cpp

engines/buried/detection.cpp

@@ -26,9 +26,9 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "common/translation.h"
 
 #include "buried/buried.h"
+#include "buried/detection.h"
 
 static const PlainGameDescriptor buriedGames[] = {
 	{"buried", "The Journeyman Project 2: Buried in Time"},
@@ -45,21 +45,6 @@ static const char *directoryGlobs[] = {
 	nullptr
 };
 
-static const ADExtraGuiOptionsMap optionsList[] = {
-	{
-		GAMEOPTION_ALLOW_SKIP,
-		{
-			// I18N: This option allows the user to skip cutscenes.
-			_s("Skip support"),
-			_s("Allow cutscenes to be skipped"),
-			"skip_support",
-			true,
-			0,
-			0
-		}
-	},
-	AD_EXTRA_GUI_OPTIONS_TERMINATOR
-};
 } // End of namespace Buried
 
 
@@ -68,8 +53,7 @@ public:
 	BuriedMetaEngineDetection() : AdvancedMetaEngineDetection(
 		Buried::gameDescriptions,
 		sizeof(ADGameDescription),
-		buriedGames,
-		Buried::optionsList) {
+		buriedGames) {
 		_flags = kADFlagUseExtraAsHint;
 		_maxScanDepth = 3;
 		_directoryGlobs = Buried::directoryGlobs;

engines/buried/detection.h

@@ -0,0 +1,29 @@
+/* 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef BURIED_DETECTION_H
+#define BURIED_DETECTION_H
+
+#define GAMEOPTION_ALLOW_SKIP	GUIO_GAMEOPTIONS1
+#define GUIO_FULL_GAME			GUIO1(GAMEOPTION_ALLOW_SKIP)
+#define GUIO_GAME_DEMO			GUIO1(GUIO_NOLAUNCHLOAD)
+
+#endif

engines/buried/detection_tables.h

@@ -21,10 +21,6 @@
 
 namespace Buried {
 
-#define GAMEOPTION_ALLOW_SKIP	GUIO_GAMEOPTIONS1
-#define GUIO_FULL_GAME			GUIO1(GAMEOPTION_ALLOW_SKIP)
-#define GUIO_GAME_DEMO			GUIO1(GUIO_NOLAUNCHLOAD)
-
 // NOTE: If variants with new languages are added, the Mayan death god
 // box puzzle will need to be updated. Check environ/mayan.cpp,
 // DeathGodPuzzleBox::isPuzzleSolved()

engines/buried/metaengine.cpp

@@ -23,13 +23,31 @@
 
 #include "common/savefile.h"
 #include "common/system.h"
+#include "common/translation.h"
 
 #include "engines/advancedDetector.h"
 
 #include "buried/buried.h"
+#include "buried/detection.h"
 
 namespace Buried {
 
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_ALLOW_SKIP,
+		{
+			// I18N: This option allows the user to skip cutscenes.
+			_s("Skip support"),
+			_s("Allow cutscenes to be skipped"),
+			"skip_support",
+			true,
+			0,
+			0
+		}
+	},
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
+};
+
 bool BuriedEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsReturnToLauncher)
@@ -78,6 +96,10 @@ public:
 		return "buried";
 	}
 
+	const ADExtraGuiOptionsMap *getAdvancedExtraGuiOptions() const override {
+		return Buried::optionsList;
+	}
+
 	bool hasFeature(MetaEngineFeature f) const override;
 	Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
 	int getMaximumSaveSlot() const override { return 999; }