[Scummvm-cvs-logs] scummvm master -> 58d318d389155ed8242e3c91585d30a5fa167502

[clone2727]

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

Summary:
daa2732bee M4: Allow Riddle to be run using the original directory structure
58d318d389 M4: Fix the title of riddle


Commit: daa2732bee60cf8df24cf606a866b889766f86b0
    https://github.com/scummvm/scummvm/commit/daa2732bee60cf8df24cf606a866b889766f86b0
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-05-06T20:12:19-07:00

Commit Message:
M4: Allow Riddle to be run using the original directory structure

Not that the game starts up or anything :P

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



diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp
index 4b20499..84e9a87 100644
--- a/engines/m4/detection.cpp
+++ b/engines/m4/detection.cpp
@@ -380,7 +380,12 @@ static const M4GameDescription gameDescriptions[] = {
 	{ AD_TABLE_END_MARKER, 0, 0 }
 };
 
-}
+} // End of namespace M4
+
+static const char *directoryGlobs[] = {
+	"option1",
+	0
+};
 
 static const ADParams detectionParams = {
 	// Pointer to ADGameDescription or its superset structure
@@ -402,9 +407,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOMIDI,
 	// Maximum directory depth
-	1,
+	2,
 	// List of directory globs
-	0
+	directoryGlobs
 };
 
 class M4MetaEngine : public AdvancedMetaEngine {
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 1a48432..e88140c 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -115,6 +115,7 @@ MadsM4Engine::MadsM4Engine(OSystem *syst, const M4GameDescription *gameDesc) :
 
 	SearchMan.addSubDirectoryMatching(gameDataDir, "goodstuf");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "resource");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "option1");
 
 	DebugMan.addDebugChannel(kDebugScript, "script", "Script debug level");
 	DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics debug level");


Commit: 58d318d389155ed8242e3c91585d30a5fa167502
    https://github.com/scummvm/scummvm/commit/58d318d389155ed8242e3c91585d30a5fa167502
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-05-06T20:12:19-07:00

Commit Message:
M4: Fix the title of riddle

Changed paths:
    engines/m4/detection.cpp



diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp
index 84e9a87..e89077f 100644
--- a/engines/m4/detection.cpp
+++ b/engines/m4/detection.cpp
@@ -48,7 +48,7 @@ Common::Platform MadsM4Engine::getPlatform() const { return _gameDescription->de
 
 static const PlainGameDescriptor m4Games[] = {
 	{"m4", "MADS/M4 engine game"},
-	{"riddle", "Riddle of Master Lu: Believe it or Not!"},
+	{"riddle", "Ripley's Believe It of Not!: The Riddle of Master Lu"},
 	{"burger", "Orion Burger"},
 	{"rex", "Rex Nebular and the Cosmic Gender Bender"},
 	{"dragon", "DragonSphere"},