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

[dreammaster]

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:
219a3aefcc M4: Add sub-directory scanning to properly detect Burger demo
a3b65c812a M4: Fix Burger demo startup
d17c4f3981 M4: Return to demo main menu after death or finishing test


Commit: 219a3aefcc9f7592d58db8d12557229054e5556b
    https://github.com/scummvm/scummvm/commit/219a3aefcc9f7592d58db8d12557229054e5556b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-12T18:21:13-08:00

Commit Message:
M4: Add sub-directory scanning to properly detect Burger demo

Changed paths:
    engines/m4/detection.cpp
    engines/m4/m4.cpp


diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp
index 0d500e75204..3e8aabd8d61 100644
--- a/engines/m4/detection.cpp
+++ b/engines/m4/detection.cpp
@@ -39,9 +39,15 @@ const DebugChannelDef M4MetaEngineDetection::debugFlagList[] = {
 	DEBUG_CHANNEL_END
 };
 
+static const char *const DIRECTORY_GLOBS[] = {
+	"goodstuf", "resource", nullptr
+};
+
 M4MetaEngineDetection::M4MetaEngineDetection() : AdvancedMetaEngineDetection(M4::gameDescriptions,
 		sizeof(M4::M4GameDescription), M4::m4Games) {
 	_guiOptions = GUIO1(GAMEOPTION_ORIGINAL_SAVELOAD);
+	_maxScanDepth = 2;
+	_directoryGlobs = DIRECTORY_GLOBS;
 }
 
 REGISTER_PLUGIN_STATIC(M4_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, M4MetaEngineDetection);
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 67bdb7b5bdd..66518605ed0 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -48,6 +48,10 @@ M4Engine *g_engine;
 M4Engine::M4Engine(OSystem *syst, const M4GameDescription *gameDesc) : Engine(syst),
 	_gameDescription(gameDesc), _randomSource("M4") {
 	g_engine = this;
+
+	const Common::FSNode gameDataDir(ConfMan.getPath("path"));
+	SearchMan.addSubDirectoryMatching(gameDataDir, "goodstuf");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "resource");
 }
 
 M4Engine::~M4Engine() {


Commit: a3b65c812a54157db5755b69ed0ef4ddac048afc
    https://github.com/scummvm/scummvm/commit/a3b65c812a54157db5755b69ed0ef4ddac048afc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-12T18:38:14-08:00

Commit Message:
M4: Fix Burger demo startup

Changed paths:
    engines/m4/burger/vars.cpp
    engines/m4/m4.cpp
    engines/m4/m4.h


diff --git a/engines/m4/burger/vars.cpp b/engines/m4/burger/vars.cpp
index 91d11fdb860..6a9aea40c40 100644
--- a/engines/m4/burger/vars.cpp
+++ b/engines/m4/burger/vars.cpp
@@ -95,16 +95,19 @@ void Vars::main_cold_data_init() {
 	debugC(1, kDebugCore, "executing - %s", GAME_MODES[_executing]);
 
 	// Set up game mode and starting room
-	_executing = WHOLE_GAME;
+	_executing = !g_engine->isDemo() ? WHOLE_GAME : INTERACTIVE_DEMO;
 
 	switch (_executing) {
 	case JUST_OVERVIEW:
 		_game.setRoom(971);		// Burger overview starts right in at 971
 		break;
+
 	case INTERACTIVE_DEMO:
 	case MAGAZINE_DEMO:
-		_game.setRoom(901);		// Burger Demo starts at the demo menu screen
+		// Burger Demo starts at the demo menu screen
+		_game.setRoom(901);
 		break;
+
 	case WHOLE_GAME:
 		_game.setRoom(g_engine->autosaveExists() ? 903 : 951);
 		break;
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 66518605ed0..1dad881a226 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -74,6 +74,9 @@ Common::Language M4Engine::getLanguage() const {
 	return _gameDescription->desc.language;
 }
 
+bool M4Engine::isDemo() const {
+	return (getFeatures() & ADGF_DEMO) != 0;
+}
 
 Common::Error M4Engine::run() {
 	// Initialize 320x200 paletted graphics mode
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 51349b24a38..7143742107c 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -101,6 +101,11 @@ public:
 	 */
 	Common::Language getLanguage() const;
 
+	/**
+	 * Return if it's a demo
+	 */
+	bool isDemo() const;
+
 	/**
 	 * Gets a random number
 	 */


Commit: d17c4f3981d00e4475d8116fbd746d53937db736
    https://github.com/scummvm/scummvm/commit/d17c4f3981d00e4475d8116fbd746d53937db736
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-12T18:52:15-08:00

Commit Message:
M4: Return to demo main menu after death or finishing test

Changed paths:
    engines/m4/burger/burger.cpp


diff --git a/engines/m4/burger/burger.cpp b/engines/m4/burger/burger.cpp
index dbb1e701e45..3b265dfee71 100644
--- a/engines/m4/burger/burger.cpp
+++ b/engines/m4/burger/burger.cpp
@@ -767,7 +767,7 @@ void BurgerEngine::wilburTeleported() {
 	}
 
 	if (_G(executing) != WHOLE_GAME) {
-		_G(game).setRoom(604);
+		_G(game).setRoom(901);
 	} else {
 		if (_G(flags)[kFifthTestPassed]) {
 			testDone5();