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

[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:
b381f3aadd SCUMM: MANIAC: Add valid targets for demo checkbox and ensure that feature GF_DEMO is set if checkbox was toggled on.


Commit: b381f3aaddf06794e0e5cf929852e7b1ade03536
    https://github.com/scummvm/scummvm/commit/b381f3aaddf06794e0e5cf929852e7b1ade03536
Author: Robert Megone (robert.megone at gmail.com)
Date: 2024-09-04T15:53:56+02:00

Commit Message:
SCUMM: MANIAC: Add valid targets for demo checkbox and ensure that feature GF_DEMO is set if checkbox was toggled on.

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


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index e04c61ac45e..5baa9556805 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -817,8 +817,9 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 #endif
 	}
     if (target.empty() || gameid == "maniac") {
-		// The kiosk demo is only available on Maniac v1
-		bool isValidTarget = !extra.contains("Demo") && extra.contains("V1");
+		// The kiosk demo script is in V1/V2 DOS, V2 Atari ST and V2 Amiga.
+        bool isValidTarget = !extra.contains("Demo") && (platform == Common::kPlatformDOS ||                                                                                        platform == Common::kPlatformAmiga  || platform == Common::kPlatformAtariST);
+
 		if (isValidTarget)
 			options.push_back(mmDemoObjectLabelsOption);
     }
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 891a57fe2a0..205244aa0b2 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -246,7 +246,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 		_debugMode = true;
 
 	_copyProtection = ConfMan.getBool("copy_protection");
-	if (ConfMan.getBool("demo_mode"))
+    if (ConfMan.getBool("demo_mode") || ConfMan.getBool("enable_demo_mode"))
 		_game.features |= GF_DEMO;
 	if (ConfMan.hasKey("nosubtitles")) {
 		// We replaced nosubtitles *ages* ago. Just convert it silently