SWORD25: Split detection code & adapt to new plugins.

configure

@@ -6161,7 +6161,7 @@ EOF
 done
 
 declare -a static_detect_engines=("PLUMBERS" "AGI" "SCUMM" "SKY" "DREAMWEB" "DRASCULA" "LURE"
-								  "SWORD1" "SWORD2")
+								  "SWORD1" "SWORD2" "SWORD25")
 detectId="_DETECTION"
 
 echo "Creating engines/plugins_table.h"

engines/sword25/detection.cpp

@@ -24,13 +24,8 @@
 #include "common/translation.h"
 #include "engines/advancedDetector.h"
 
-#include "sword25/sword25.h"
+#include "sword25/detection_enums.h"
 #include "sword25/detection_tables.h"
-#include "sword25/kernel/persistenceservice.h"
-
-namespace Sword25 {
-uint32 Sword25Engine::getGameFlags() const { return _gameDescription->flags; }
-}
 
 static const PlainGameDescriptor sword25Game[] = {
 	{"sword25", "Broken Sword 2.5"},
@@ -69,53 +64,13 @@ public:
 		return "Broken Sword 2.5 (C) Malte Thiesen, Daniel Queteschiner and Michael Elsdorfer";
 	}
 
-	bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
-	bool hasFeature(MetaEngineFeature f) const override;
 	const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
-	int getMaximumSaveSlot() const override { return Sword25::PersistenceService::getSlotCount(); }
-	SaveStateList listSaves(const char *target) const override;
 };
 
-bool Sword25MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
-	if (desc) {
-		*engine = new Sword25::Sword25Engine(syst, desc);
-	}
-	return desc != 0;
-}
-
-bool Sword25MetaEngine::hasFeature(MetaEngineFeature f) const {
-	return
-		(f == kSupportsListSaves);
-}
-
 const ExtraGuiOptions Sword25MetaEngine::getExtraGuiOptions(const Common::String &target) const {
 	ExtraGuiOptions options;
 	options.push_back(sword25ExtraGuiOption);
 	return options;
 }
 
-SaveStateList Sword25MetaEngine::listSaves(const char *target) const {
-	Common::String pattern = target;
-	pattern = pattern + ".###";
-	SaveStateList saveList;
-
-	Sword25::PersistenceService ps;
-	Sword25::setGameTarget(target);
-
-	ps.reloadSlots();
-
-	for (uint i = 0; i < ps.getSlotCount(); ++i) {
-		if (ps.isSlotOccupied(i)) {
-			Common::String desc = ps.getSavegameDescription(i);
-			saveList.push_back(SaveStateDescriptor(i, desc));
-		}
-	}
-
-	return saveList;
-}
-
-#if PLUGIN_ENABLED_DYNAMIC(SWORD25)
-	REGISTER_PLUGIN_DYNAMIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngine);
-#else
-	REGISTER_PLUGIN_STATIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngine);
-#endif
+REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_METAENGINE, Sword25MetaEngine);

engines/sword25/detection_enums.h

@@ -0,0 +1,30 @@
+/* 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+
+namespace Sword25 {
+
+enum GameFlags {
+	GF_EXTRACTED = 1 << 0
+};
+
+} // End of namespace Sword25

engines/sword25/metaengine.cpp

@@ -0,0 +1,83 @@
+/* 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "engines/advancedDetector.h"
+
+#include "sword25/sword25.h"
+#include "sword25/kernel/persistenceservice.h"
+
+namespace Sword25 {
+
+uint32 Sword25Engine::getGameFlags() const { return _gameDescription->flags; }
+
+} // End of namespace Sword25
+
+class Sword25MetaEngineConnect : public AdvancedMetaEngineConnect {
+public:
+    const char *getName() const override {
+		return "sword25";
+	}
+
+    bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+	bool hasFeature(MetaEngineFeature f) const override;
+
+    int getMaximumSaveSlot() const override { return Sword25::PersistenceService::getSlotCount(); }
+	SaveStateList listSaves(const char *target) const override;
+};
+
+bool Sword25MetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+	if (desc) {
+		*engine = new Sword25::Sword25Engine(syst, desc);
+	}
+	return desc != 0;
+}
+
+bool Sword25MetaEngineConnect::hasFeature(MetaEngineFeature f) const {
+	return
+		(f == kSupportsListSaves);
+}
+
+SaveStateList Sword25MetaEngineConnect::listSaves(const char *target) const {
+	Common::String pattern = target;
+	pattern = pattern + ".###";
+	SaveStateList saveList;
+
+	Sword25::PersistenceService ps;
+	Sword25::setGameTarget(target);
+
+	ps.reloadSlots();
+
+	for (uint i = 0; i < ps.getSlotCount(); ++i) {
+		if (ps.isSlotOccupied(i)) {
+			Common::String desc = ps.getSavegameDescription(i);
+			saveList.push_back(SaveStateDescriptor(i, desc));
+		}
+	}
+
+	return saveList;
+}
+
+#if PLUGIN_ENABLED_DYNAMIC(SWORD25)
+	REGISTER_PLUGIN_DYNAMIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngineConnect);
+#else
+	REGISTER_PLUGIN_STATIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngineConnect);
+#endif

engines/sword25/module.mk

@@ -2,7 +2,7 @@ MODULE := engines/sword25
 
 MODULE_OBJS := \
 	console.o \
-	detection.o \
+	metaengine.o \
 	sword25.o \
 	fmv/movieplayer.o \
 	fmv/movieplayer_script.o \
@@ -62,3 +62,6 @@ endif
 
 # Include common rules
 include $(srcdir)/rules.mk
+
+# Detection objects
+DETECT_OBJS += $(MODULE)/detection.o

engines/sword25/sword25.h

@@ -27,6 +27,7 @@
 #include "engines/engine.h"
 
 #include "sword25/console.h"
+#include "sword25/detection_enums.h"
 
 namespace Common {
 class Error;
@@ -58,10 +59,6 @@ enum {
 	kDebugResource = 1 << 2
 };
 
-enum GameFlags {
-	GF_EXTRACTED = 1 << 0
-};
-
 #define MESSAGE_BASIC 1
 #define MESSAGE_INTERMEDIATE 2
 #define MESSAGE_DETAILED 3