[Scummvm-cvs-logs] SF.net SVN: scummvm:[49929] scummvm/trunk/engines/touche

[Kirben at users.sourceforge.net]

Revision: 49929
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49929&view=rev
Author:   Kirben
Date:     2010-06-17 13:42:02 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Add detection of original directory structure for Touche.

Modified Paths:
--------------
    scummvm/trunk/engines/touche/detection.cpp
    scummvm/trunk/engines/touche/touche.cpp

Modified: scummvm/trunk/engines/touche/detection.cpp
===================================================================
--- scummvm/trunk/engines/touche/detection.cpp	2010-06-17 12:29:58 UTC (rev 49928)
+++ scummvm/trunk/engines/touche/detection.cpp	2010-06-17 13:42:02 UTC (rev 49929)
@@ -124,6 +124,11 @@
 
 } // End of namespace Touche
 
+static const char *directoryGlobs[] = {
+	"database",
+	0
+};
+
 static const ADParams detectionParams = {
 	(const byte *)Touche::gameDescriptions,
 	sizeof(ADGameDescription),
@@ -136,9 +141,9 @@
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1,
+	2,
 	// List of directory globs
-	0
+	directoryGlobs
 };
 
 class ToucheMetaEngine : public AdvancedMetaEngine {

Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp	2010-06-17 12:29:58 UTC (rev 49928)
+++ scummvm/trunk/engines/touche/touche.cpp	2010-06-17 13:42:02 UTC (rev 49929)
@@ -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 @@
 	_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");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.