[Scummvm-git-logs] scummvm master -> 79b4eff2d9a343feac581ca50cee2205d88ab928

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3079652bad DEVTOOLS: CREATE_ENGINE: Added GUIO example to the generated engine skeleton
79b4eff2d9 DEVTOOLS: CREATE_ENGINE: Print out error message on unsuccessful directory creation


Commit: 3079652bad130d35d3ff5ecc8ac83f059a31c9f7
    https://github.com/scummvm/scummvm/commit/3079652bad130d35d3ff5ecc8ac83f059a31c9f7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-20T15:39:13+01:00

Commit Message:
DEVTOOLS: CREATE_ENGINE: Added GUIO example to the generated engine skeleton

Changed paths:
  A devtools/create_engine/files/POTFILES
    devtools/create_engine/create_engine.cpp
    devtools/create_engine/files/detection.h
    devtools/create_engine/files/metaengine.cpp
    devtools/create_engine/files/metaengine.h


diff --git a/devtools/create_engine/create_engine.cpp b/devtools/create_engine/create_engine.cpp
index a8a0d96d497..768bb9a939d 100644
--- a/devtools/create_engine/create_engine.cpp
+++ b/devtools/create_engine/create_engine.cpp
@@ -45,7 +45,7 @@ static const char *const FILENAMES[] = {
 	"credits.pl", "detection.cpp", "detection.h",
 	"detection_tables.h", "metaengine.cpp",
 	"metaengine.h", "module.mk", "xyzzy.cpp",
-	"xyzzy.h", nullptr
+	"xyzzy.h", "POTFILES", nullptr
 };
 const char *const ENGINES = "create_project ..\\.. --use-canonical-lib-names --msvc\n";
 
diff --git a/devtools/create_engine/files/POTFILES b/devtools/create_engine/files/POTFILES
new file mode 100644
index 00000000000..5fd15403ba1
--- /dev/null
+++ b/devtools/create_engine/files/POTFILES
@@ -0,0 +1 @@
+engines/xyzzy/metaengine.cpp
diff --git a/devtools/create_engine/files/detection.h b/devtools/create_engine/files/detection.h
index 1b9d86b750c..83fbbcb6cd8 100644
--- a/devtools/create_engine/files/detection.h
+++ b/devtools/create_engine/files/detection.h
@@ -38,7 +38,9 @@ extern const PlainGameDescriptor xyzzyGames[];
 
 extern const ADGameDescription gameDescriptions[];
 
-} // namespace Xyzzy
+#define GAMEOPTION_ORIGINAL_SAVELOAD GUIO_GAMEOPTIONS1
+
+} // End of namespace Xyzzy
 
 class XyzzyMetaEngineDetection : public AdvancedMetaEngineDetection {
 	static const DebugChannelDef debugFlagList[];
diff --git a/devtools/create_engine/files/metaengine.cpp b/devtools/create_engine/files/metaengine.cpp
index 3931ee262ed..5b409a47fb9 100644
--- a/devtools/create_engine/files/metaengine.cpp
+++ b/devtools/create_engine/files/metaengine.cpp
@@ -19,14 +19,39 @@
  *
  */
 
+#include "common/translation.h"
+
 #include "xyzzy/metaengine.h"
 #include "xyzzy/detection.h"
 #include "xyzzy/xyzzy.h"
 
+namespace Xyzzy {
+
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_ORIGINAL_SAVELOAD,
+		{
+			_s("Use original save/load screens"),
+			_s("Use the original save/load screens instead of the ScummVM ones"),
+			"original_menus",
+			false,
+			0,
+			0
+		}
+	},
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
+};
+
+} // End of namespace Xyzzy
+
 const char *XyzzyMetaEngine::getName() const {
 	return "xyzzy";
 }
 
+const ADExtraGuiOptionsMap *XyzzyMetaEngine::getAdvancedExtraGuiOptions() const {
+	return Xyzzy::optionsList;
+}
+
 Common::Error XyzzyMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	*engine = new Xyzzy::XyzzyEngine(syst, desc);
 	return Common::kNoError;
diff --git a/devtools/create_engine/files/metaengine.h b/devtools/create_engine/files/metaengine.h
index 903eea46281..dc6562bcf0c 100644
--- a/devtools/create_engine/files/metaengine.h
+++ b/devtools/create_engine/files/metaengine.h
@@ -37,6 +37,8 @@ public:
 	 * Used by e.g. the launcher to determine whether to enable the Load button.
 	 */
 	bool hasFeature(MetaEngineFeature f) const override;
+
+	const ADExtraGuiOptionsMap *getAdvancedExtraGuiOptions() const override;
 };
 
 #endif // XYZZY_METAENGINE_H


Commit: 79b4eff2d9a343feac581ca50cee2205d88ab928
    https://github.com/scummvm/scummvm/commit/79b4eff2d9a343feac581ca50cee2205d88ab928
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-20T15:42:41+01:00

Commit Message:
DEVTOOLS: CREATE_ENGINE: Print out error message on unsuccessful directory creation

Changed paths:
    devtools/create_engine/create_engine.cpp


diff --git a/devtools/create_engine/create_engine.cpp b/devtools/create_engine/create_engine.cpp
index 768bb9a939d..9cdeea00cd4 100644
--- a/devtools/create_engine/create_engine.cpp
+++ b/devtools/create_engine/create_engine.cpp
@@ -219,6 +219,7 @@ int main(int argc, char *argv[]) {
 
 	if (!createDirectory(folder)) {
 		printf("Could not create engine folder.\n");
+		perror(folder);
 		return 0;
 	}
 	printf("done\n");