[Scummvm-git-logs] scummvm master -> f668e4a6126a8ea0ae821e32f2eed654c22f57bb

[bluegr]

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

Summary:
ef50d7e3a7 ENGINES: Have engines declare if they provide custom help.
60ca37a810 GUI: Only enable help button when supported
f668e4a612 SCUMM: This engine provides custom help


Commit: ef50d7e3a79802a5d365f050a62184768cb5bef7
    https://github.com/scummvm/scummvm/commit/ef50d7e3a79802a5d365f050a62184768cb5bef7
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2022-08-07T22:45:07+03:00

Commit Message:
ENGINES: Have engines declare if they provide custom help.

Changed paths:
    engines/engine.h


diff --git a/engines/engine.h b/engines/engine.h
index 1fb3d226b07..5fb6b6f8195 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -286,7 +286,14 @@ public:
 		 * The engine will need to read the actual resolution used by the
 		 * backend using OSystem::getWidth and OSystem::getHeight.
 		 */
-		kSupportsArbitraryResolutions
+		kSupportsArbitraryResolutions,
+
+		/**
+		 * The game provides custom help.
+		 *
+		 * This enables the help button in the main menu.
+		 */
+		 kSupportsHelp
 	};
 
 


Commit: 60ca37a8108df8cfa721f3c158bbd073ad8c3d19
    https://github.com/scummvm/scummvm/commit/60ca37a8108df8cfa721f3c158bbd073ad8c3d19
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2022-08-07T22:45:07+03:00

Commit Message:
GUI: Only enable help button when supported

Changed paths:
    engines/dialogs.cpp


diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index eac24922714..5131c81e86f 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -81,6 +81,8 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
 	// To enable "Help", an engine needs to use a subclass of MainMenuDialog
 	// (at least for now, we might change how this works in the future).
 	_helpButton = new GUI::ButtonWidget(this, "GlobalMenu.Help", _("~H~elp"), Common::U32String(), kHelpCmd);
+	_helpButton->setVisible(_engine->hasFeature(Engine::kSupportsHelp));
+	_helpButton->setEnabled(_engine->hasFeature(Engine::kSupportsHelp));
 
 	new GUI::ButtonWidget(this, "GlobalMenu.About", _("~A~bout"), Common::U32String(), kAboutCmd);
 


Commit: f668e4a6126a8ea0ae821e32f2eed654c22f57bb
    https://github.com/scummvm/scummvm/commit/f668e4a6126a8ea0ae821e32f2eed654c22f57bb
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2022-08-07T22:45:07+03:00

Commit Message:
SCUMM: This engine provides custom help

Changed paths:
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 7b863d53638..e958178e2c3 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -237,6 +237,7 @@ bool ScummEngine::hasFeature(EngineFeature f) const {
 		(f == kSupportsLoadingDuringRuntime) ||
 		(f == kSupportsSavingDuringRuntime) ||
 		(f == kSupportsSubtitleOptions) ||
+		(f == kSupportsHelp) ||
 		(
 			f == kSupportsChangingOptionsDuringRuntime &&
 			Common::String(_game.guioptions).contains(GUIO_AUDIO_OVERRIDE)