Add detection of original directory structure for Touche.

svn-id: r49929

2 files changed, 13 insertions, 2 deletions

diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index f336c2e008..35f03fa657 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -124,6 +124,11 @@ static const ADFileBasedFallback fileBasedFallback[] = {
 
 } // End of namespace Touche
 
+static const char *directoryGlobs[] = {
+	"database",
+	0
+};
+
 static const ADParams detectionParams = {
 	(const byte *)Touche::gameDescriptions,
 	sizeof(ADGameDescription),
@@ -136,9 +141,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1,
+	2,
 	// List of directory globs
-	0
+	directoryGlobs
 };
 
 class ToucheMetaEngine : public AdvancedMetaEngine {
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 187e685d06..2dc8b76b4f 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -28,6 +28,8 @@
 #include "common/debug-channels.h"
 #include "common/events.h"
 #include "common/EventRecorder.h"
+#include "common/file.h"
+#include "common/fs.h"
 #include "common/system.h"
 
 #include "engines/util.h"
@@ -70,6 +72,10 @@ ToucheEngine::ToucheEngine(OSystem *system, Common::Language language)
 	_menuRedrawCounter = 0;
 	memset(_paletteBuffer, 0, sizeof(_paletteBuffer));
 
+	const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+	SearchMan.addSubDirectoryMatching(gameDataDir, "database");
+
 	DebugMan.addDebugChannel(kDebugEngine,   "Engine",   "Engine debug level");
 	DebugMan.addDebugChannel(kDebugGraphics, "Graphics", "Graphics debug level");
 	DebugMan.addDebugChannel(kDebugResource, "Resource", "Resource debug level");