[Scummvm-git-logs] scummvm master -> 353c27bdceb9c235a8a0f77c9a2bd1c58746b251

dreammaster noreply at scummvm.org
Tue May 20 01:33:26 UTC 2025 

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

Summary:
7f959eca7e M4: RIDDLE: Implement initializePath
3e06ad6b09 M4: RIDDLE: Add detection for demo on the website
353c27bdce M4: RIDDLE: Set Riddle of Master Lu for testing


Commit: 7f959eca7efa79a9a4014d2d2896a212933b63d0
    https://github.com/scummvm/scummvm/commit/7f959eca7efa79a9a4014d2d2896a212933b63d0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-05-19T18:32:57-07:00

Commit Message:
M4: RIDDLE: Implement initializePath

Changed paths:
    engines/m4/m4.cpp
    engines/m4/m4.h
    engines/m4/riddle/riddle.cpp
    engines/m4/riddle/riddle.h


diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 9cb14fa0ec9..60f11fd7d13 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -50,15 +50,17 @@ 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() {
 }
 
+void M4Engine::initializePath(const Common::FSNode &gamePath) {
+	Engine::initializePath(gamePath);
+	SearchMan.addDirectory(gamePath.getChild("goodstuf"));
+	SearchMan.addDirectory(gamePath.getChild("resource"), 0, 2);
+}
+
 uint32 M4Engine::getFeatures() const {
 	return _gameDescription->desc.flags;
 }
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 807fda94b1b..131f95b3619 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -111,6 +111,8 @@ public:
 		return _randomSource.getRandomNumber(maxNum);
 	}
 
+	void initializePath(const Common::FSNode &gamePath) override;
+
 	bool hasFeature(EngineFeature f) const override {
 		return
 		    (f == kSupportsLoadingDuringRuntime) ||
diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index a948f50d9ca..eaf2f3b65d0 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "common/config-manager.h"
 #include "common/debug.h"
 #include "m4/riddle/gui/game_menu.h"
 #include "m4/riddle/riddle.h"
@@ -45,6 +46,11 @@ RiddleEngine::RiddleEngine(OSystem *syst, const M4GameDescription *gameDesc) :
 	_sections.push_back(&_section9);
 }
 
+void RiddleEngine::initializePath(const Common::FSNode &gamePath) {
+	M4Engine::initializePath(gamePath);
+	SearchMan.addDirectory(gamePath.getChild("option1"));
+}
+
 M4::Vars *RiddleEngine::createVars() {
 	return new Riddle::Vars();
 }
diff --git a/engines/m4/riddle/riddle.h b/engines/m4/riddle/riddle.h
index 70b6e23c2b4..fbee9b18f89 100644
--- a/engines/m4/riddle/riddle.h
+++ b/engines/m4/riddle/riddle.h
@@ -82,6 +82,8 @@ public:
 	RiddleEngine(OSystem *syst, const M4GameDescription *gameDesc);
 	~RiddleEngine() override {}
 
+	void initializePath(const Common::FSNode &gamePath) override;
+
 	/**
 	 * Show the engine information
 	 */


Commit: 3e06ad6b0961c77fdf25243c1dc32d692dd2b053
    https://github.com/scummvm/scummvm/commit/3e06ad6b0961c77fdf25243c1dc32d692dd2b053
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-05-19T18:32:57-07:00

Commit Message:
M4: RIDDLE: Add detection for demo on the website

Though it doesn't properly start up yet, because the
standard game startup tries to load a room that isn't
in the demo.

Changed paths:
    engines/m4/detection_tables.h


diff --git a/engines/m4/detection_tables.h b/engines/m4/detection_tables.h
index dcd0a19325c..3351e0f725c 100644
--- a/engines/m4/detection_tables.h
+++ b/engines/m4/detection_tables.h
@@ -221,10 +221,23 @@ static const M4GameDescription gameDescriptions[] = {
 		GType_Riddle,
 		kFeaturesDemo
 	},
-	{	// Game Version NYUK -- July 13, 1995
+	{	// Game Version DELTOID - June 8, 1995
 		{
 			"riddle",
 			"Demo",
+			AD_ENTRY1s("option1/ripley.has", "3a90dd7052860b6e246ec7e0aaf202f6", 104527),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_DEMO | ADGF_UNSTABLE,
+			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
+		},
+		GType_Riddle,
+		kFeaturesDemo
+	},
+	{	// Game Version NYUK -- July 13, 1995
+		{
+			"riddle",
+			"Demo2",
 			// Small/Medium/Vast installation
 			AD_ENTRY1s("ripley.has", "2c5e80441c4ace6ff4ffe0ecd4099a58", 149057),
 			// Large/Huge installation


Commit: 353c27bdceb9c235a8a0f77c9a2bd1c58746b251
    https://github.com/scummvm/scummvm/commit/353c27bdceb9c235a8a0f77c9a2bd1c58746b251
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-05-19T18:32:57-07:00

Commit Message:
M4: RIDDLE: Set Riddle of Master Lu for testing

Changed paths:
    engines/m4/detection_tables.h


diff --git a/engines/m4/detection_tables.h b/engines/m4/detection_tables.h
index 3351e0f725c..2044f000042 100644
--- a/engines/m4/detection_tables.h
+++ b/engines/m4/detection_tables.h
@@ -137,7 +137,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ripley.has", "056d517360c89eb4c297a319f21a7071", 700469),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
 		},
 		GType_Riddle,
@@ -150,7 +150,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ripley.has", "d073582c9011d44dd0d7e2ede317a86d", 700469),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
 		},
 		GType_Riddle,
@@ -163,7 +163,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ripley.has", "d9e9f8befec432a047b1047fb2bc7aea", 710997),
 			Common::DE_DEU,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
 		},
 		GType_Riddle,
@@ -176,7 +176,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ripley.has", "3d48c5700785d11e6a5bc832b95be918", 701973),
 			Common::FR_FRA,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
 		},
 		GType_Riddle,
@@ -189,7 +189,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ripley.has", "5ee011cff7178dae3ddf6f9b7d4102ac", 701691),
 			Common::ES_ESP,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
 		},
 		GType_Riddle,
@@ -202,7 +202,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ripley.has", "30ad07f5c52af0cb72020df042674aa8", 704511),
 			Common::IT_ITA,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOASPECT, GUIO_NOMUSIC, GUIO_NOSPEECH)
 		},
 		GType_Riddle,

More information about the Scummvm-git-logs mailing list