[Scummvm-git-logs] scummvm master -> 145398c22202376018e5d32e46e68f4de0a4b6a6

[AndywinXp]

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

Summary:
145398c222 SCUMM: MM - Add option to boot into demo/kiosk mode to the GUI bug #14501


Commit: 145398c22202376018e5d32e46e68f4de0a4b6a6
    https://github.com/scummvm/scummvm/commit/145398c22202376018e5d32e46e68f4de0a4b6a6
Author: Robert Megone (robert.megone at gmail.com)
Date: 2024-08-09T13:15:20+02:00

Commit Message:
SCUMM: MM - Add option to boot into demo/kiosk mode to the GUI bug #14501

Changed paths:
    engines/scumm/metaengine.cpp
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 377a899774c..8642370e680 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -751,6 +751,15 @@ static const ExtraGuiOption enableCopyProtection = {
 	0
 };
 
+static const ExtraGuiOption mmDemoObjectLabelsOption = {
+	_s("Enable demo/kisok mode"),
+	_s("Enable demo/kiosk mode in the full retail version of Maniac Mansion. Beware, not every version supports this."),
+	"enable_demo_mode",
+	false,
+	0,
+	0
+};
+
 const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &target) const {
 	ExtraGuiOptions options;
 	// Query the GUI options
@@ -797,7 +806,9 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 			options.push_back(fmtownsForceHiResMode);
 #endif
 	}
-
+    if (target.empty() || gameid == "maniac") {
+        options.push_back(mmDemoObjectLabelsOption);
+    }
 	// The Steam Mac versions of Loom and Indy 3 are more akin to the VGA
 	// DOS versions, and that's how ScummVM usually sees them. But that
 	// rebranding does not happen until later.
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ca795e525a0..4f5e418a0c3 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3769,10 +3769,10 @@ void ScummEngine::runBootscript() {
 
 	args[0] = _bootParam;
 
-	if (_game.id == GID_MANIAC && (_game.features & GF_DEMO) && (_game.platform != Common::kPlatformC64))
-		runScript(9, 0, 0, args);
+	if ((_game.id == GID_MANIAC && (_game.features & GF_DEMO) && (_game.platform != Common::kPlatformC64)) || ConfMan.getBool("enable_demo_mode"))
+    	runScript(9, 0, 0, args);
 	else
-		runScript(1, 0, 0, args);
+    	runScript(1, 0, 0, args);
 }
 
 #ifdef ENABLE_HE