From daa2732bee60cf8df24cf606a866b889766f86b0 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 6 May 2011 23:09:53 -0400
Subject: M4: Allow Riddle to be run using the original directory structure

Not that the game starts up or anything :P
---
 engines/m4/detection.cpp | 11 ++++++++---
 engines/m4/m4.cpp        |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/m4/detection.cpp b/engines/m4/detection.cpp
index 4b204996f3..84e9a874c7 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 1a484322fd..e88140cd26 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");
-- 
cgit v1.2.3